From b529fdc5562ba0d9751e5dce1fccf164374278b0 Mon Sep 17 00:00:00 2001
From: PeterNiblett <pdn3270@gmail.com>
Date: Thu, 29 Jan 2015 17:01:59 +0000
Subject: [PATCH] 0_8_0 -> 1_0_0 migration
---
CDT-eventLog-v1_0_0.xsd | 160 ++++++++---------
CDT-execInstance-v1_0_0.xsd | 6 +-
CDT-firmware-v1_0_0.xsd | 160 ++++++++---------
CDT-group-v1_0_0.xsd | 10 +-
CDT-locationPolicy-v1_0_0.xsd | 12 +-
CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd | 8 +-
CDT-memory-v1_0_0.xsd | 148 ++++++++--------
CDT-mgmtCmd-v1_0_0.xsd | 8 +-
CDT-node-v1_0_0.xsd | 30 ++--
CDT-notification-v1_0_0.xsd | 141 +++++++--------
CDT-pollingChannel-v1_0_0.xsd | 6 +-
CDT-reboot-v1_0_0.xsd | 148 ++++++++--------
CDT-remoteCSE-v1_0_0.xsd | 22 +--
CDT-request-v1_0_0.xsd | 8 +-
CDT-requestPrimitive-v1_0_0.xsd | 163 +++++++++--------
CDT-responsePrimitive-v1_0_0.xsd | 147 ++++++++--------
CDT-schedule-v1_0_0.xsd | 9 +-
CDT-serviceSubscribedAppRule-v1_0_0.xsd | 6 +-
CDT-serviceSubscribedNode-v1_0_0.xsd | 6 +-
CDT-software-v1_0_0.xsd | 176 +++++++++----------
CDT-statsCollect-v1_0_0.xsd | 6 +-
CDT-statsConfig-v1_0_0.xsd | 8 +-
CDT-subscription-v1_0_0.xsd | 6 +-
23 files changed, 692 insertions(+), 702 deletions(-)
diff --git a/CDT-eventLog-v1_0_0.xsd b/CDT-eventLog-v1_0_0.xsd
index e946ec7..1788a48 100644
--- a/CDT-eventLog-v1_0_0.xsd
+++ b/CDT-eventLog-v1_0_0.xsd
@@ -1,80 +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.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
-No recommendation as to products or vendors is made or should be implied.
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
- xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
- attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-
- <xs:element name="eventLog">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit Common Attributes from data type "mgmtResource" -->
- <xs:extension base="m2m:mgmtResource">
- <!-- Resource Specific Attributes -->
- <xs:sequence>
- <xs:element name="logTypeId" type="m2m:logTypeId" />
- <xs:element name="logData" type="xs:string" />
- <xs:element name="logStatus" type="m2m:logStatus" />
- <xs:element name="logStart" type="xs:boolean" />
- <xs:element name="logStop" type="xs:boolean" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="eventLogAnnc">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
- <xs:extension base="m2m:announcedMgmtResource">
- <!-- Resource Specific Attributes -->
- <xs:sequence>
- <xs:element name="logTypeId" type="m2m:logTypeId" minOccurs="0" />
- <xs:element name="logData" type="xs:string" minOccurs="0" />
- <xs:element name="logStatus" type="m2m:logStatus" minOccurs="0" />
- <xs:element name="logStart" type="xs:boolean" minOccurs="0" />
- <xs:element name="logStop" type="xs:boolean" minOccurs="0" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
+No recommendation as to products or vendors is made or should be implied.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema 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-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+
+ <xs:element name="eventLog">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit Common Attributes from data type "mgmtResource" -->
+ <xs:extension base="m2m:mgmtResource">
+ <!-- Resource Specific Attributes -->
+ <xs:sequence>
+ <xs:element name="logTypeId" type="m2m:logTypeId" />
+ <xs:element name="logData" type="xs:string" />
+ <xs:element name="logStatus" type="m2m:logStatus" />
+ <xs:element name="logStart" type="xs:boolean" />
+ <xs:element name="logStop" type="xs:boolean" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="eventLogAnnc">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
+ <xs:extension base="m2m:announcedMgmtResource">
+ <!-- Resource Specific Attributes -->
+ <xs:sequence>
+ <xs:element name="logTypeId" type="m2m:logTypeId" minOccurs="0" />
+ <xs:element name="logData" type="xs:string" minOccurs="0" />
+ <xs:element name="logStatus" type="m2m:logStatus" minOccurs="0" />
+ <xs:element name="logStart" type="xs:boolean" minOccurs="0" />
+ <xs:element name="logStop" type="xs:boolean" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/CDT-execInstance-v1_0_0.xsd b/CDT-execInstance-v1_0_0.xsd
index 1f6b7c8..1a64988 100644
--- a/CDT-execInstance-v1_0_0.xsd
+++ b/CDT-execInstance-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:element name="execInstance">
<xs:complexType>
diff --git a/CDT-firmware-v1_0_0.xsd b/CDT-firmware-v1_0_0.xsd
index 19e9b24..4ab6972 100644
--- a/CDT-firmware-v1_0_0.xsd
+++ b/CDT-firmware-v1_0_0.xsd
@@ -1,80 +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.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
-No recommendation as to products or vendors is made or should be implied.
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
- xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
- attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-
- <xs:element name="firmware">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit Common Attributes from data type "mgmtResource" -->
- <xs:extension base="m2m:mgmtResource">
- <!-- Resource Specific Attributes -->
- <xs:sequence>
- <xs:element name="version" type="xs:string" />
- <xs:element name="name" type="xs:string" />
- <xs:element name="URL" type="xs:anyURI" />
- <xs:element name="update" type="xs:boolean" />
- <xs:element name="updateStatus" type="m2m:actionStatus" minOccurs="0" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="firmwareAnnc">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
- <xs:extension base="m2m:announcedMgmtResource">
- <!-- Resource Specific Attributes -->
- <xs:sequence>
- <xs:element name="version" type="xs:string" minOccurs="0" />
- <xs:element name="name" type="xs:string" minOccurs="0" />
- <xs:element name="URL" type="xs:anyURI" minOccurs="0" />
- <xs:element name="update" type="xs:boolean" minOccurs="0" />
- <xs:element name="updateStatus" type="m2m:actionStatus" minOccurs="0" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
+No recommendation as to products or vendors is made or should be implied.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema 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-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+
+ <xs:element name="firmware">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit Common Attributes from data type "mgmtResource" -->
+ <xs:extension base="m2m:mgmtResource">
+ <!-- Resource Specific Attributes -->
+ <xs:sequence>
+ <xs:element name="version" type="xs:string" />
+ <xs:element name="name" type="xs:string" />
+ <xs:element name="URL" type="xs:anyURI" />
+ <xs:element name="update" type="xs:boolean" />
+ <xs:element name="updateStatus" type="m2m:actionStatus" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="firmwareAnnc">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
+ <xs:extension base="m2m:announcedMgmtResource">
+ <!-- Resource Specific Attributes -->
+ <xs:sequence>
+ <xs:element name="version" type="xs:string" minOccurs="0" />
+ <xs:element name="name" type="xs:string" minOccurs="0" />
+ <xs:element name="URL" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="update" type="xs:boolean" minOccurs="0" />
+ <xs:element name="updateStatus" type="m2m:actionStatus" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/CDT-group-v1_0_0.xsd b/CDT-group-v1_0_0.xsd
index 81649bc..0783e1e 100644
--- a/CDT-group-v1_0_0.xsd
+++ b/CDT-group-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:element name="group">
<xs:complexType>
@@ -39,7 +39,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence>
<xs:element name="creator" type="m2m:ID" minOccurs="0" />
<xs:element name="memberType" type="m2m:memberType" />
- <!-- TODO: data type xs:long is used in TS-0004 for currentNrOfMembers and maxNrOfMembers (unchanged in #662R02) -->
+ <!-- TODO: data type xs:integer is used in TS-0004 for currentNrOfMembers and maxNrOfMembers (TS-0004 to be corrected) -->
<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" />
<xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" />
<xs:element name="memberIDs" type="m2m:listOfURIs" />
@@ -70,7 +70,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence>
<xs:element name="memberType" type="m2m:memberType" minOccurs="0" />
<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
- <!-- TODO: data type xs:long is used in TS-0004 for currentNrOfMembers and maxNrOfMembers (unchanged in #662R02) -->
+ <!-- TODO: data type xs:integer is used in TS-0004 for currentNrOfMembers and maxNrOfMembers (TS-0004 to be corrected) -->
<xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="memberIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
diff --git a/CDT-locationPolicy-v1_0_0.xsd b/CDT-locationPolicy-v1_0_0.xsd
index 8731cce..e75ac7e 100644
--- a/CDT-locationPolicy-v1_0_0.xsd
+++ b/CDT-locationPolicy-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:element name="locationPolicy">
<xs:complexType>
@@ -43,7 +43,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
- <!-- TODO: Data type changed from "xs:string" to "m2m:status". Table 7.3.10.1 3 of TS-0004 needs to be corrected -->
+ <!-- TODO: Data type changed from "xs:string" to "m2m:status". Table 7.3.10.1-3 of TS-0004 needs to be corrected -->
<xs:element name="locationStatus" type="m2m:status" />
<!-- Child Resources -->
@@ -72,7 +72,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
- <!-- TODO: Data type changed from "xs:string" to "m2m:status". Table 7.3.10.1 3 of TS-0004 needs to be corrected -->
+ <!-- TODO: Data type changed from "xs:string" to "m2m:status". Table 7.3.10.1-3 of TS-0004 needs to be corrected -->
<xs:element name="locationStatus" type="m2m:status" minOccurs="0" />
<!-- No Child Resources -->
@@ -81,4 +81,4 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexContent>
</xs:complexType>
</xs:element>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd b/CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd
index 41ea089..d4707a1 100644
--- a/CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd
+++ b/CDT-m2mServiceSubscriptionProfile-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v1_0_0.xsd" />
<xs:element name="m2mServiceSubscriptionProfile">
<xs:complexType>
diff --git a/CDT-memory-v1_0_0.xsd b/CDT-memory-v1_0_0.xsd
index aa48fe9..bd1c280 100644
--- a/CDT-memory-v1_0_0.xsd
+++ b/CDT-memory-v1_0_0.xsd
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
-contained in the original materials on any copies of the materials and that you comply strictly with these terms.
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
-No recommendation as to products or vendors is made or should be implied.
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
- xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-
- <xs:element name="memory">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit Common Attributes from data type "mgmtResource" -->
- <xs:extension base="m2m:mgmtResource">
- <!-- Resource Specific Attributes -->
- <xs:sequence>
- <xs:element name="memAvailable" type="xs:unsignedLong" />
- <xs:element name="memTotal" type="xs:unsignedLong" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="memoryAnnc">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
- <xs:extension base="m2m:announcedMgmtResource">
- <!-- Resource Specific Attributes -->
- <xs:sequence>
- <xs:element name="memAvailable" type="xs:unsignedLong" minOccurs="0" />
- <xs:element name="memTotal" type="xs:unsignedLong" minOccurs="0" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
+No recommendation as to products or vendors is made or should be implied.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema 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-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+
+ <xs:element name="memory">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit Common Attributes from data type "mgmtResource" -->
+ <xs:extension base="m2m:mgmtResource">
+ <!-- Resource Specific Attributes -->
+ <xs:sequence>
+ <xs:element name="memAvailable" type="xs:unsignedLong" />
+ <xs:element name="memTotal" type="xs:unsignedLong" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="memoryAnnc">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
+ <xs:extension base="m2m:announcedMgmtResource">
+ <!-- Resource Specific Attributes -->
+ <xs:sequence>
+ <xs:element name="memAvailable" type="xs:unsignedLong" minOccurs="0" />
+ <xs:element name="memTotal" type="xs:unsignedLong" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/CDT-mgmtCmd-v1_0_0.xsd b/CDT-mgmtCmd-v1_0_0.xsd
index 9550e1d..bc2eecc 100644
--- a/CDT-mgmtCmd-v1_0_0.xsd
+++ b/CDT-mgmtCmd-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v1_0_0.xsd" />
<xs:element name="mgmtCmd">
<xs:complexType>
diff --git a/CDT-node-v1_0_0.xsd b/CDT-node-v1_0_0.xsd
index 2739aef..3b034ee 100644
--- a/CDT-node-v1_0_0.xsd
+++ b/CDT-node-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -27,20 +27,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-software-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:element name="node">
<xs:complexType>
diff --git a/CDT-notification-v1_0_0.xsd b/CDT-notification-v1_0_0.xsd
index a778a64..d13094b 100644
--- a/CDT-notification-v1_0_0.xsd
+++ b/CDT-notification-v1_0_0.xsd
@@ -1,74 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-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.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
-No recommendation as to products or vendors is made or should be implied.
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.onem2m.org/xml/protocols"
- xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v0_8_0.xsd"/>
-
- <!-- TODO: This "notification data object" does not comply (and does not need to comply) with the
- generic <resourceType> specification conventions. One and only one instance of this data object is included
- into the Content parameter of a Notify request primitive. However, the data object may include information,
- associated with one or more notification events. Do we need to differentiate singleNotification from
- aggregatedNotification? Probably not. Then the below top-level structure can be simplified to represent simply
- an unbounded sequence of singleNotification elements only.
- We need to add into TS-0004 information which corresponds to the <resourceType> tables shown in TS-0001.
- -->
- <xs:element name="notification" type="m2m:notification" />
-
- <xs:element name="aggregatedNotification" type="m2m:aggregatedNotification" />
-
- <xs:complexType name="aggregatedNotification">
- <xs:sequence>
- <xs:element name="notification" type="m2m:notification" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="notification">
- <xs:sequence>
- <xs:element name="notificationEvent" minOccurs="0">
- <xs:complexType >
- <xs:sequence>
- <xs:element name="representation" type="xs:anyType" minOccurs="0"/>
- <xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0"/>
- <xs:element name="operationMonitor" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="operation" type="m2m:operation" minOccurs="0"/>
- <xs:element name="originator" type="m2m:ID" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/>
- <xs:element name="subscriptionDeletion" type="xs:boolean" minOccurs="0"/>
- <xs:element name="subscriptionReference" type="xs:anyURI" minOccurs="0"/>
- <xs:element name="creator" type="m2m:ID" minOccurs="0"/>
- <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/>
- </xs:sequence>
- </xs:complexType>
-
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+
+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"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v1_0_0.xsd"/>
+
+
+ <xs:element name="notification" type="m2m:notification" />
+
+ <xs:element name="aggregatedNotification" type="m2m:aggregatedNotification" />
+
+ <xs:complexType name="aggregatedNotification">
+ <xs:sequence>
+ <xs:element name="notification" type="m2m:notification" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="notification">
+ <xs:sequence>
+ <xs:element name="notificationEvent" minOccurs="0">
+ <xs:complexType >
+ <xs:sequence>
+ <xs:element name="representation" type="xs:anyType" minOccurs="0"/>
+ <xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0"/>
+ <xs:element name="operationMonitor" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="operation" type="m2m:operation" minOccurs="0"/>
+ <xs:element name="originator" type="m2m:ID" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/>
+ <xs:element name="subscriptionDeletion" type="xs:boolean" minOccurs="0"/>
+ <xs:element name="subscriptionReference" type="xs:anyURI" minOccurs="0"/>
+ <xs:element name="creator" type="m2m:ID" minOccurs="0"/>
+ <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+
+</xs:schema>
diff --git a/CDT-pollingChannel-v1_0_0.xsd b/CDT-pollingChannel-v1_0_0.xsd
index 73f8d6d..b3e46eb 100644
--- a/CDT-pollingChannel-v1_0_0.xsd
+++ b/CDT-pollingChannel-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:element name="pollingChannel">
<xs:complexType>
diff --git a/CDT-reboot-v1_0_0.xsd b/CDT-reboot-v1_0_0.xsd
index 90f4633..f797bd1 100644
--- a/CDT-reboot-v1_0_0.xsd
+++ b/CDT-reboot-v1_0_0.xsd
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
-contained in the original materials on any copies of the materials and that you comply strictly with these terms.
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
-No recommendation as to products or vendors is made or should be implied.
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
- xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
- attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-
- <xs:element name="reboot">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit Common Attributes from data type "mgmtResource" -->
- <xs:extension base="m2m:mgmtResource">
- <!-- Resource Specific Attributes -->
- <xs:sequence>
- <xs:element name="reboot" type="xs:boolean" />
- <xs:element name="factoryReset" type="xs:boolean" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="rebootAnnc">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
- <xs:extension base="m2m:announcedMgmtResource">
- <!-- Resource Specific Attributes -->
- <xs:sequence>
- <xs:element name="reboot" type="xs:boolean" minOccurs="0" />
- <xs:element name="factoryReset" type="xs:boolean" minOccurs="0" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
+No recommendation as to products or vendors is made or should be implied.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema 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-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+
+ <xs:element name="reboot">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit Common Attributes from data type "mgmtResource" -->
+ <xs:extension base="m2m:mgmtResource">
+ <!-- Resource Specific Attributes -->
+ <xs:sequence>
+ <xs:element name="reboot" type="xs:boolean" />
+ <xs:element name="factoryReset" type="xs:boolean" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="rebootAnnc">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
+ <xs:extension base="m2m:announcedMgmtResource">
+ <!-- Resource Specific Attributes -->
+ <xs:sequence>
+ <xs:element name="reboot" type="xs:boolean" minOccurs="0" />
+ <xs:element name="factoryReset" type="xs:boolean" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/CDT-remoteCSE-v1_0_0.xsd b/CDT-remoteCSE-v1_0_0.xsd
index 414a613..1032353 100644
--- a/CDT-remoteCSE-v1_0_0.xsd
+++ b/CDT-remoteCSE-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -26,17 +26,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-container-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-group-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-node-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v1_0_0.xsd" />
<xs:element name="remoteCSE">
<xs:complexType>
diff --git a/CDT-request-v1_0_0.xsd b/CDT-request-v1_0_0.xsd
index 71928b7..3bb3bc7 100644
--- a/CDT-request-v1_0_0.xsd
+++ b/CDT-request-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:element name="request">
<xs:complexType>
@@ -60,4 +60,4 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexContent>
</xs:complexType>
</xs:element>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/CDT-requestPrimitive-v1_0_0.xsd b/CDT-requestPrimitive-v1_0_0.xsd
index fb8e5aa..bb9ce6e 100644
--- a/CDT-requestPrimitive-v1_0_0.xsd
+++ b/CDT-requestPrimitive-v1_0_0.xsd
@@ -1,82 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
-contained in the original materials on any copies of the materials and that you comply strictly with these terms.
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards
-and applicable regulations. No recommendation as to products or vendors is made or should be implied.
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT,
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="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" >
-
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.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="1"/>
- <!-- parameter "Request Identifier" -->
- <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/>
- <!-- parameter "ResourceType" -->
- <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
- <!-- parameter "Name" -->
- <xs:element name="name" type="xs:string" minOccurs="0"/>
- <!-- parameter "Content" (of the primitive)-->
- <xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/>
- <!-- parameter "Originating Timestamp" -->
- <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
- <!-- parameter "Request Expiration Timestamp" -->
- <xs:element name="requestExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
- <!-- parameter "Result Expiration Timestamp" -->
- <xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
- <!-- parameter "Operation Execution Time" -->
- <xs:element name="operationExecutionTime" type="m2m:timestamp" minOccurs="0"/>
- <!-- parameter "Response Type" -->
- <xs:element name="responseType" type="m2m:resourceType" minOccurs="0"/>
- <!-- TODO: check if the old names Response Persistense and responsePersistence have been replaced everywhere in TS-0004 -->
- <!-- parameter "Result Persistence" -->
- <xs:element name="resultPersistence" type="xs:duration" 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"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="attributeList" type="m2m:attributeList" />
-
-</xs:schema>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards
+and applicable regulations. No recommendation as to products or vendors is made or should be implied.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT,
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<xs:schema xmlns:xs="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" >
+
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.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="1"/>
+ <!-- parameter "Request Identifier" -->
+ <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/>
+ <!-- parameter "ResourceType" -->
+ <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
+ <!-- parameter "Name" -->
+ <xs:element name="name" type="xs:string" minOccurs="0"/>
+ <!-- parameter "Content" (of the primitive)-->
+ <xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/>
+ <!-- parameter "Originating Timestamp" -->
+ <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
+ <!-- parameter "Request Expiration Timestamp" -->
+ <xs:element name="requestExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
+ <!-- parameter "Result Expiration Timestamp" -->
+ <xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
+ <!-- parameter "Operation Execution Time" -->
+ <xs:element name="operationExecutionTime" type="m2m:timestamp" minOccurs="0"/>
+ <!-- parameter "Response Type" -->
+ <xs:element name="responseType" type="m2m:resourceType" minOccurs="0"/>
+ <!-- parameter "Result Persistence" -->
+ <xs:element name="resultPersistence" type="xs:duration" 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"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="attributeList" type="m2m:attributeList" />
+
+</xs:schema>
+
diff --git a/CDT-responsePrimitive-v1_0_0.xsd b/CDT-responsePrimitive-v1_0_0.xsd
index dd4f9b3..678858a 100644
--- a/CDT-responsePrimitive-v1_0_0.xsd
+++ b/CDT-responsePrimitive-v1_0_0.xsd
@@ -1,74 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright Notification
-
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
-contained in the original materials on any copies of the materials and that you comply strictly with these terms.
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience
-to understand and interpret its contents in accordance with generally accepted engineering or other professional standards
-and applicable regulations. No recommendation as to products or vendors is made or should be implied.
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT,
-WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-<xs:schema xmlns:xs="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" >
-
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-
- <xs:element name="responsePrimitive" >
- <xs:complexType>
- <xs:sequence>
- <!-- Response Code and Status Code primitive parameters defined in TS-0001 have been merged into
- Response Status Code in TS-0004 -->
- <!-- TODO: Table 6.4.2-1 of TS-0004 needs to be corrected: "m2m:responseStatus" to be replaced by "m2m:responseStatusCode" -->
- <!-- parameter "Response Status Code" -->
- <xs:element name="responseStatusCode" type="m2m:responseStatusCode" minOccurs="1"/>
- <!-- parameter "Request Identifier" -->
- <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/>
- <!-- parameter "Content" (of the primitive) -->
- <xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/>
- <!-- parameter "To" -->
- <xs:element name="to" type="m2m:ID" minOccurs="0"/>
- <!-- parameter "From" -->
- <xs:element name="from" type="m2m:ID" minOccurs="0"/>
- <!-- parameter "Originating Timestamp" -->
- <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
- <!-- parameter "Result Expiration Timestamp" -->
- <xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
- <!-- parameter "Event Category" -->
- <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="resource" type="m2m:resourceWrapper" />
-
- <xs:element name="URIlist" type="m2m:listOfURIs" />
-
- <xs:element name="aggregatedResponse" type="m2m:aggregatedResponse" />
-
-
- <xs:complexType name="aggregatedResponse">
- <xs:sequence>
- <xs:element ref="m2m:responsePrimitive" minOccurs="1" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
-
-</xs:schema>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience
+to understand and interpret its contents in accordance with generally accepted engineering or other professional standards
+and applicable regulations. No recommendation as to products or vendors is made or should be implied.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT,
+WITH RESPECT TO ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+<xs:schema xmlns:xs="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" >
+
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+
+ <xs:element name="responsePrimitive" >
+ <xs:complexType>
+ <xs:sequence>
+ <!-- Response Code and Status Code primitive parameters defined in TS-0001 have been merged into
+ Response Status Code in TS-0004 -->
+ <!-- parameter "Response Status Code" -->
+ <xs:element name="responseStatusCode" type="m2m:responseStatusCode" minOccurs="1"/>
+ <!-- parameter "Request Identifier" -->
+ <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/>
+ <!-- parameter "Content" (of the primitive) -->
+ <xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/>
+ <!-- parameter "To" -->
+ <xs:element name="to" type="m2m:ID" minOccurs="0"/>
+ <!-- parameter "From" -->
+ <xs:element name="from" type="m2m:ID" minOccurs="0"/>
+ <!-- parameter "Originating Timestamp" -->
+ <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
+ <!-- parameter "Result Expiration Timestamp" -->
+ <xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
+ <!-- parameter "Event Category" -->
+ <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="resource" type="m2m:resourceWrapper" />
+
+ <xs:element name="URIlist" type="m2m:listOfURIs" />
+
+ <xs:element name="aggregatedResponse" type="m2m:aggregatedResponse" />
+
+
+ <xs:complexType name="aggregatedResponse">
+ <xs:sequence>
+ <xs:element ref="m2m:responsePrimitive" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+
+</xs:schema>
+
diff --git a/CDT-schedule-v1_0_0.xsd b/CDT-schedule-v1_0_0.xsd
index 5e35ef4..fbc3200 100644
--- a/CDT-schedule-v1_0_0.xsd
+++ b/CDT-schedule-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:element name="schedule">
<xs:complexType>
@@ -36,7 +36,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announceableSubordinateResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
- <!-- TODO: Editor's notes on multiplicity of 'scheduleElement' attribute: should be 1 -->
<xs:element name="scheduleElement" type="m2m:scheduleEntries" />
<!-- Child Resources -->
@@ -64,4 +63,4 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexContent>
</xs:complexType>
</xs:element>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
diff --git a/CDT-serviceSubscribedAppRule-v1_0_0.xsd b/CDT-serviceSubscribedAppRule-v1_0_0.xsd
index 283ac7b..96098a5 100644
--- a/CDT-serviceSubscribedAppRule-v1_0_0.xsd
+++ b/CDT-serviceSubscribedAppRule-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:element name="serviceSubscribedAppRule">
<xs:complexType>
diff --git a/CDT-serviceSubscribedNode-v1_0_0.xsd b/CDT-serviceSubscribedNode-v1_0_0.xsd
index 2c50cc1..ddbf54d 100644
--- a/CDT-serviceSubscribedNode-v1_0_0.xsd
+++ b/CDT-serviceSubscribedNode-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:element name="serviceSubscribedNode">
<xs:complexType>
diff --git a/CDT-software-v1_0_0.xsd b/CDT-software-v1_0_0.xsd
index 2ad6b53..bd6538d 100644
--- a/CDT-software-v1_0_0.xsd
+++ b/CDT-software-v1_0_0.xsd
@@ -1,88 +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.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
-
-Notice of Disclaimer & Limitation of Liability
-
-The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
-and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
-No recommendation as to products or vendors is made or should be implied.
-
-NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
-GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
-PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
-NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
-ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
-oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
-
--->
-
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
- xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
- attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
-
- <xs:element name="software">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit Common Attributes from data type "mgmtResource" -->
- <xs:extension base="m2m:mgmtResource">
- <!-- Resource Specific Attributes -->
- <xs:sequence>
- <xs:element name="version" type="xs:string" />
- <xs:element name="name" type="xs:string" />
- <xs:element name="URL" type="xs:anyURI" />
- <xs:element name="install" type="xs:boolean" minOccurs="0" />
- <xs:element name="uninstall" type="xs:boolean" minOccurs="0" />
- <xs:element name="installStatus" type="m2m:actionStatus" minOccurs="0" />
- <xs:element name="activate" type="xs:boolean" minOccurs="0"/>
- <xs:element name="deactivate" type="xs:boolean" minOccurs="0"/>
- <xs:element name="activeStatus" type="m2m:actionStatus" minOccurs="0"/>
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="softwareAnnc">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
- <xs:extension base="m2m:announcedMgmtResource">
- <!-- Resource Specific Attributes -->
- <xs:sequence>
- <xs:element name="version" type="xs:string" minOccurs="0" />
- <xs:element name="name" type="xs:string" minOccurs="0" />
- <xs:element name="URL" type="xs:anyURI" minOccurs="0" />
- <xs:element name="install" type="xs:boolean" minOccurs="0" />
- <xs:element name="uninstall" type="xs:boolean" minOccurs="0" />
- <xs:element name="installStatus" type="m2m:actionStatus" minOccurs="0" />
- <xs:element name="activate" type="xs:boolean" minOccurs="0"/>
- <xs:element name="deactivate" type="xs:boolean" minOccurs="0"/>
- <xs:element name="activeStatus" type="m2m:actionStatus" minOccurs="0"/>
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright Notification
+
+The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
+contained in the original materials on any copies of the materials and that you comply strictly with these terms.
+This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
+any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+
+Notice of Disclaimer & Limitation of Liability
+
+The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
+and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
+No recommendation as to products or vendors is made or should be implied.
+
+NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
+GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
+PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
+NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO
+ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
+oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
+
+-->
+
+<xs:schema 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-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
+
+ <xs:element name="software">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit Common Attributes from data type "mgmtResource" -->
+ <xs:extension base="m2m:mgmtResource">
+ <!-- Resource Specific Attributes -->
+ <xs:sequence>
+ <xs:element name="version" type="xs:string" />
+ <xs:element name="name" type="xs:string" />
+ <xs:element name="URL" type="xs:anyURI" />
+ <xs:element name="install" type="xs:boolean" minOccurs="0" />
+ <xs:element name="uninstall" type="xs:boolean" minOccurs="0" />
+ <xs:element name="installStatus" type="m2m:actionStatus" minOccurs="0" />
+ <xs:element name="activate" type="xs:boolean" minOccurs="0"/>
+ <xs:element name="deactivate" type="xs:boolean" minOccurs="0"/>
+ <xs:element name="activeStatus" type="m2m:actionStatus" minOccurs="0"/>
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="softwareAnnc">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
+ <xs:extension base="m2m:announcedMgmtResource">
+ <!-- Resource Specific Attributes -->
+ <xs:sequence>
+ <xs:element name="version" type="xs:string" minOccurs="0" />
+ <xs:element name="name" type="xs:string" minOccurs="0" />
+ <xs:element name="URL" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="install" type="xs:boolean" minOccurs="0" />
+ <xs:element name="uninstall" type="xs:boolean" minOccurs="0" />
+ <xs:element name="installStatus" type="m2m:actionStatus" minOccurs="0" />
+ <xs:element name="activate" type="xs:boolean" minOccurs="0"/>
+ <xs:element name="deactivate" type="xs:boolean" minOccurs="0"/>
+ <xs:element name="activeStatus" type="m2m:actionStatus" minOccurs="0"/>
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/CDT-statsCollect-v1_0_0.xsd b/CDT-statsCollect-v1_0_0.xsd
index 977c4ff..829ce7d 100644
--- a/CDT-statsCollect-v1_0_0.xsd
+++ b/CDT-statsCollect-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:element name="statsCollect">
<xs:complexType>
diff --git a/CDT-statsConfig-v1_0_0.xsd b/CDT-statsConfig-v1_0_0.xsd
index e455ba7..7e523b7 100644
--- a/CDT-statsConfig-v1_0_0.xsd
+++ b/CDT-statsConfig-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v1_0_0.xsd" />
<xs:element name="statsConfig">
<xs:complexType>
diff --git a/CDT-subscription-v1_0_0.xsd b/CDT-subscription-v1_0_0.xsd
index 7da33fb..845fe7d 100644
--- a/CDT-subscription-v1_0_0.xsd
+++ b/CDT-subscription-v1_0_0.xsd
@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<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" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v0_8_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v1_0_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v1_0_0.xsd" />
<xs:element name="subscription">
<xs:complexType>
--
GitLab