Commit d4a2ee34 authored by Wolfgang Granzow's avatar Wolfgang Granzow

updates for TS-0004 alignment

alignment with PRO-2015-663 (Annex D) and PRO-2015-684 (notification)
parent 01e834a3
......@@ -42,7 +42,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="status" type="xs:string" minOccurs="0" />
<xs:element name="listOfNeighbors" type="m2m:listOfURIs" />
<xs:element name="listOfNeighbors" type="m2m:listOfM2MID" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......
......@@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:sequence>
<xs:element name="areaNwkType" type="xs:string" />
<xs:element name="listOfDevices" type="m2m:listOfURIs" />
<xs:element name="listOfDevices" type="m2m:listOfM2MID" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......
......@@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:mgmtResource">
<!-- Resource Specific Attributes -->
<xs:sequence>
<xs:element name="batteryLevel" type="xs:nonNegativeInteger"/>
<xs:element name="batteryLevel" type="xs:unsignedInt"/>
<xs:element name="batteryStatus" type="m2m:batteryStatus" />
<!-- Child Resources -->
......
<?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"/>
<!-- 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">
<xs:complexType>
<xs:choice>
<!-- Resource Specific Attributes -->
<xs:element name="aggregatedNotification" type="m2m:aggregatedNotification" minOccurs="0"/>
<xs:element name="singleNotification" type="m2m:singleNotification" minOccurs="0"/>
</xs:choice>
</xs:complexType>
</xs:element>
<xs:complexType name="aggregatedNotification">
<xs:sequence>
<xs:element name="singleNotification" type="m2m:singleNotification" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="singleNotification">
<xs:sequence>
<xs:element name="notificationEvent" type="m2m:notificationEventList" minOccurs="0"/>
<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:complexType name="notificationEventList">
<xs:sequence>
<xs:element name="event" type="m2m:notificationEvent" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="notificationEvent">
<xs:sequence>
<xs:element name="representation" type="xs:string" minOccurs="0"/>
<xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0"/>
<xs:element name="operationMonitor" type="m2m:operationMonitorType" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="operationMonitorType">
<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:schema>
......@@ -38,14 +38,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:sequence>
<xs:element name="version" type="xs:string" />
<xs:element name="name" type="m2m:listOfURIs" />
<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="activateStatus" type="m2m:actionStatus" minOccurs="0"/>
<xs:element name="activeStatus" type="m2m:actionStatus" minOccurs="0"/>
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment