Skip to content
Snippets Groups Projects
Commit 143721f8 authored by Wolfgang Granzow's avatar Wolfgang Granzow
Browse files

Rel-2 changes agreed at PRO#24

see PRO-2016-0350 for detailed list of changes
parent 6a9cef14
No related branches found
No related tags found
No related merge requests found
Showing
with 92 additions and 160 deletions
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -42,8 +42,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-trafficPattern-v2_7_0.xsd" />
<xs:element name="node">
<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
......@@ -71,6 +72,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:activeCmdhPolicy" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:trafficPattern" />
</xs:choice>
</xs:choice>
</xs:sequence>
......@@ -79,7 +81,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
<xs:element name="nodeAnnc">
<xs:element name="nodeAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
......@@ -106,6 +108,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:semanticDescriptorAnnc" />
<xs:element ref="m2m:trafficPatternAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
......@@ -4,7 +4,7 @@ Copyright Notification
No part of this document may be reproduced, in an electronic retrieval system or otherwise, except as authorized by written permission.
The copyright and the foregoing restriction extend to reproduction in all media.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -79,23 +79,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="securityInfoType" type="m2m:securityInfoType" minOccurs="0" />
<xs:element name="dasRequest" type="m2m:dynAuthDasRequest" minOccurs="0" />
<xs:element name="dasResponse" type="m2m:dynAuthDasResponse" minOccurs="0" />
<xs:element name="e2eRandObject" type="m2m:receiverE2ERandObject" minOccurs="0" />
<xs:element name="esprimObject" type="m2m:eSPrimObject" minOccurs="0" />
<xs:element name="esprimRandObject" type="m2m:receiverESPrimRandObject" minOccurs="0" />
<xs:element name="esprimObject" type="m2m:e2eCompactJWE" minOccurs="0" />
<xs:element name="escertkeMessage" type="xs:base64Binary" minOccurs="0" />
</xs:sequence>
</xs:complexType>
<!-- dummy data type for missing definition of m2m:receiverE2ERandObject -->
<xs:simpleType name="receiverE2ERandObject">
<xs:restriction base="xs:string" />
</xs:simpleType>
<!-- dummy data type for missing definition of m2m:eSPrimObject -->
<xs:simpleType name="eSPrimObject">
<xs:restriction base="xs:string" />
</xs:simpleType>
<xs:simpleType name="securityInfoType">
<xs:restriction base="xs:integer">
<!-- Dynamic Authorization Request -->
......@@ -113,56 +102,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<xs:complexType name="dynAuthDasRequest">
<xs:sequence>
<xs:element name="originator" type="m2m:ID" minOccurs="1" />
<xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="1" />
<xs:element name="operation" type="m2m:operation" minOccurs="1" />
<xs:element name="originatorIP" minOccurs="0" >
<xs:complexType>
<xs:sequence>
<xs:element name="ipv4Address" type="m2m:ipv4" minOccurs="0" />
<xs:element name="ipv6Address" type="m2m:ipv6" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="originatorLocation" type="m2m:locationRegion" minOccurs="0" />
<xs:element name="originatorRoleIDs" minOccurs="0" >
<xs:simpleType>
<xs:restriction>
<xs:simpleType>
<xs:list itemType="m2m:roleID" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="requestTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
<xs:element name="targetedResourceID" type="xs:anyURI" minOccurs="0" />
<xs:element name="proposedPrivilegesLifetime" type="m2m:absRelTimestamp" minOccurs="0" />
<xs:element name="roleIDsFromACPs" minOccurs="0" >
<xs:simpleType>
<xs:restriction>
<xs:simpleType>
<xs:list itemType="m2m:roleID" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="tokenIDs" minOccurs="0" >
<xs:simpleType>
<xs:restriction>
<xs:simpleType>
<xs:list itemType="m2m:tokenID" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="dynAuthDasResponse">
<xs:sequence>
<xs:element name="dynamicACPInfo" minOccurs="0" >
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="notificationTargetMgmtPolicyRef">
<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-policyDeletionRules-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="notificationTargetPolicy">
<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="policyDeletionRules">
<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -30,16 +30,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="pollingChannel">
<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
<xs:extension base="m2m:subordinateResource">
<xs:sequence>
<!-- No Resource Specific Attributes -->
<!-- Virtual Child Resource -->
<xs:element name="pollingChannelURI" type="xs:anyURI" />
<!-- No Resource Specific Attributes and no child resources -->
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="reboot">
<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
......@@ -51,7 +51,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
<xs:element name="rebootAnnc">
<xs:element name="rebootAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -27,6 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-AE-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-container-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-group-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-accessControlPolicy-v2_7_0.xsd" />
......@@ -37,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-locationPolicy-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-timeSeries-v2_7_0.xsd" />
<xs:element name="remoteCSE">
<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
......@@ -52,18 +53,29 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientID" minOccurs="0" />
<xs:element name="requestReachability" type="xs:boolean" />
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<xs:element name="triggerReferenceNumber" type="xs:unsignedInt" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:nodeAnnc" />
<xs:element ref="m2m:container" />
<xs:element ref="m2m:containerAnnc" />
<xs:element ref="m2m:group" />
<xs:element ref="m2m:groupAnnc" />
<xs:element ref="m2m:accessControlPolicy" />
<xs:element ref="m2m:accessControlPolicyAnnc" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:pollingChannel" />
<xs:element ref="m2m:schedule" />
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:timeSeriesAnnc" />
<xs:element ref="m2m:locationPolicyAnnc" />
<xs:element ref="m2m:AEAnnc" />
<xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:sg_announcedFlexContainerResource" />
</xs:choice>
</xs:choice>
</xs:sequence>
......@@ -72,7 +84,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
<xs:element name="remoteCSEAnnc">
<xs:element name="remoteCSEAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announced Resources -->
......@@ -85,6 +97,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="CSE-ID" type="m2m:ID" minOccurs="0" />
<xs:element name="requestReachability" type="xs:boolean" minOccurs="0" />
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......@@ -103,6 +116,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:locationPolicyAnnc" />
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:timeSeriesAnnc" />
<xs:element ref="m2m:AEAnnc" />
<xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:sg_announcedFlexContainerResource" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="request">
<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
......
......@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......
......@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -99,6 +99,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resultExpirationTimestamp" type="m2m:absRelTimestamp" minOccurs="0"/>
<!-- parameter "Event Category" -->
<xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
<!-- parameter "Content Status" -->
<xs:element name="contentStatus" type="m2m:contentStatus" minOccurs="0" />
<!-- parameter "Content Offset" -->
<xs:element name="contentOffset" type="xs:positiveInteger" minOccurs="0" />
<!-- parameter "Assigned Token Identifiers -->
<xs:element name="assignedTokenIdentifiers" type="m2m:dynAuthLocalTokenIdAssignments" minOccurs="0" />
<!-- parameter "Token Request Information -->
......@@ -115,57 +119,24 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="aggregatedResponse" type="m2m:aggregatedResponse" />
<xs:element name="resourceRefList" type="m2m:listOfChildResourceRef" />
<xs:element name="debugInfo" type="xs:string" />
<xs:complexType name="resourceWrapper">
<xs:sequence>
<xs:choice minOccurs="1" maxOccurs="1">
<xs:element ref="m2m:accessControlPolicy" />
<xs:element ref="m2m:activeCmdhPolicy" />
<xs:element ref="m2m:AE" />
<xs:element ref="m2m:areaNwkDeviceInfo" />
<xs:element ref="m2m:areaNwkInfo" />
<xs:element ref="m2m:battery" />
<xs:element ref="m2m:cmdhBuffer" />
<xs:element ref="m2m:cmdhDefaults" />
<xs:element ref="m2m:cmdhDefEcValue" />
<xs:element ref="m2m:cmdhEcDefParamValues" />
<xs:element ref="m2m:cmdhLimits" />
<xs:element ref="m2m:cmdhNetworkAccessRules" />
<xs:element ref="m2m:cmdhNwAccessRule" />
<xs:element ref="m2m:cmdhPolicy" />
<xs:element ref="m2m:container" />
<xs:element ref="m2m:contentInstance" />
<xs:element ref="m2m:CSEBase" />
<xs:element ref="m2m:delivery" />
<xs:element ref="m2m:deviceCapability" />
<xs:element ref="m2m:deviceInfo" />
<xs:element ref="m2m:eventConfig" />
<xs:element ref="m2m:eventLog" />
<xs:element ref="m2m:execInstance" />
<xs:element ref="m2m:firmware" />
<xs:element ref="m2m:group" />
<xs:element ref="m2m:locationPolicy" />
<xs:element ref="m2m:m2mServiceSubscriptionProfile" />
<xs:element ref="m2m:memory" />
<xs:element ref="m2m:mgmtCmd" />
<xs:element ref="m2m:node" />
<xs:element ref="m2m:notification" />
<xs:element ref="m2m:pollingChannel" />
<xs:element ref="m2m:reboot" />
<xs:element ref="m2m:remoteCSE" />
<xs:element ref="m2m:request" />
<xs:element ref="m2m:requestPrimitive" />
<xs:element ref="m2m:responsePrimitive" />
<xs:element ref="m2m:schedule" />
<xs:element ref="m2m:serviceSubscribedAppRule" />
<xs:element ref="m2m:serviceSubscribedNode" />
<xs:element ref="m2m:software" />
<xs:element ref="m2m:statsCollect" />
<xs:element ref="m2m:statsConfig" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:timeSeriesInstance" />
<xs:element ref="m2m:role" />
<xs:element ref="m2m:token" />
<xs:element ref="m2m:sg_resource" />
<xs:element ref="m2m:sg_regularResource" />
<xs:element ref="m2m:sg_announcedResource" />
<xs:element ref="m2m:sg_announceableResource" />
<xs:element ref="m2m:sg_subordinateResource" />
<xs:element ref="m2m:sg_announcedSubordinateResource" />
<xs:element ref="m2m:sg_announceableSubordinateResource" />
<xs:element ref="m2m:sg_mgmtResource" />
<xs:element ref="m2m:sg_announcedMgmtResource" />
<xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:sg_announcedFlexContainerResource" />
</xs:choice>
<xs:element name="URI" type="xs:anyURI" />
</xs:sequence>
......@@ -175,7 +146,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="aggregatedResponse">
<xs:sequence>
<xs:element name="resourceID" type="xs:anyURI" minOccurs="0"/>
<xs:element ref="m2m:responsePrimitive" minOccurs="1" maxOccurs="unbounded"/>
<xs:element ref="m2m:responsePrimitive" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="listOfChildResourceRef">
<xs:sequence>
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
......
......@@ -7,7 +7,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="role">
<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:regularResource">
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="schedule">
<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announceableSubordinateResource">
......@@ -51,7 +51,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
<xs:element name="scheduleAnnc">
<xs:element name="scheduleAnnc" substitutionGroup="m2m:sg_announcedSubordinateResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announcedSubordinateResource">
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="semanticDescriptor">
<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
......@@ -55,7 +55,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
<xs:element name="semanticDescriptorAnnc">
<xs:element name="semanticDescriptorAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="serviceSubscribedAppRule">
<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="serviceSubscribedNode">
<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="software">
<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "mgmtResource" -->
......@@ -58,7 +58,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
<xs:element name="softwareAnnc">
<xs:element name="softwareAnnc" substitutionGroup="m2m:sg_announcedMgmtResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit Common Attributes from data type "announcedMgmtResource" -->
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -29,7 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="statsCollect">
<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-eventConfig-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_7_0.xsd" />
<xs:element name="statsConfig">
<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
......
......@@ -6,7 +6,7 @@ The oneM2M Partners authorize you to copy this document, provided that you retai
contained in the original materials on any copies of the materials and that you comply strictly with these terms.
This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
Notice of Disclaimer & Limitation of Liability
......@@ -31,7 +31,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-schedule-v2_7_0.xsd" />
<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_7_0.xsd" />
<xs:element name="subscription">
<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes from RegularResource Type -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment