diff --git a/CDT-AE-v0_8_0.xsd b/CDT-AE-v0_8_0.xsd new file mode 100644 index 0000000000000000000000000000000000000000..99db87fb84b77ad90ff63b6846bb80bdacbe1ffb --- /dev/null +++ b/CDT-AE-v0_8_0.xsd @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright Notification + +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices +contained in the original materials on any copies of the materials and that you comply strictly with these terms. +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. +© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved. + +Notice of Disclaimer & Limitation of Liability + +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. +No recommendation as to products or vendors is made or should be implied. + +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. +NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER. + +--> +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> + + <xs:include schemaLocation="CDT-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:element name="AE"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes for announceable Resources --> + <xs:extension base="m2m:announceableResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="appName" type="xs:string" minOccurs="0" /> + <xs:element name="App-ID" type="xs:string" /> + <xs:element name="AE-ID" type="m2m:ID" /> + <xs:element name="pointOfAccess" type="m2m:pOAList" minOccurs="0" /> + <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> + <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> + + <!-- Child Resources --> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> + <xs:choice minOccurs="1" maxOccurs="unbounded"> + <xs:element ref="m2m:container" /> + <xs:element ref="m2m:group" /> + <xs:element ref="m2m:accessControlPolicy" /> + <xs:element ref="m2m:subscription" /> + <xs:element ref="m2m:pollingChannel" /> + </xs:choice> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="AEAnnc"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes for announced Resources --> + <xs:extension base="m2m:announcedResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="appName" type="xs:string" minOccurs="0" /> + <xs:element name="App-ID" type="xs:string" /> + <xs:element name="AE-ID" type="m2m:ID" /> + <xs:element name="pointOfAccess" type="m2m:pOAList" minOccurs="0" /> + <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> + <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> + + <!-- Child Resources --> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> + <xs:choice minOccurs="1" maxOccurs="unbounded"> + <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:choice> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> +</xs:schema> diff --git a/CDT-CSEBase-v0_8_0.xsd b/CDT-CSEBase-v0_8_0.xsd new file mode 100644 index 0000000000000000000000000000000000000000..5b3e7b55fb660dfcceb39273ee554300e646d1f8 --- /dev/null +++ b/CDT-CSEBase-v0_8_0.xsd @@ -0,0 +1,91 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright Notification + +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices +contained in the original materials on any copies of the materials and that you comply strictly with these terms. +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. +© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved. + +Notice of Disclaimer & Limitation of Liability + +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. +No recommendation as to products or vendors is made or should be implied. + +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. +NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER. + +--> +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-remoteCSE-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-node-v0_8_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-mgmtCmd-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-locationPolicy-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-statsConfig-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-statsCollect-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-request-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-delivery-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-schedule-v0_8_0.xsd" /> + + <xs:element name="CSEBase"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit just the universal resource attributes --> + <xs:extension base="m2m:resource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" /> + <xs:element name="cseType" type="m2m:cseTypeID" minOccurs="0" /> + <!-- TODO: update TS-0004 to say m2m:ID not m2m:id --> + <xs:element name="CSE-ID" type="m2m:ID" /> + <!-- TODO: update TS-0004 to remove m2m:resourceTypeList --> + <xs:element name="supportedResourceType"> + <xs:simpleType> + <xs:list itemType="m2m:resourceType" /> + </xs:simpleType> + </xs:element> + <xs:element name="pointOfAccess" type="m2m:pOAList" /> + <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> + <xs:element name="notificationCongestionPolicy" type="m2m:notificationCongestionPolicy" minOccurs="0" /> + + <!-- Child Resources --> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> + <xs:choice minOccurs="1" maxOccurs="unbounded"> + <xs:element ref="m2m:remoteCSE" /> + <xs:element ref="m2m:node" /> + <xs:element ref="m2m:AE" /> + <xs:element ref="m2m:container" /> + <xs:element ref="m2m:group" /> + <xs:element ref="m2m:accessControlPolicy" /> + <xs:element ref="m2m:subscription" /> + <xs:element ref="m2m:mgmtCmd" /> + <xs:element ref="m2m:locationPolicy" /> + <xs:element ref="m2m:statsConfig" /> + <xs:element ref="m2m:statsCollect" /> + <xs:element ref="m2m:request" /> + <xs:element ref="m2m:delivery" /> + <xs:element ref="m2m:schedule" /> + </xs:choice> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> +</xs:schema> diff --git a/CDT-accessControlPolicy-v0_8_0.xsd b/CDT-accessControlPolicy-v0_8_0.xsd new file mode 100644 index 0000000000000000000000000000000000000000..c42aefdbeb2d4537e5e29699bd76b2560c945c55 --- /dev/null +++ b/CDT-accessControlPolicy-v0_8_0.xsd @@ -0,0 +1,174 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright Notification + +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices +contained in the original materials on any copies of the materials and that you comply strictly with these terms. +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. +© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved. + +Notice of Disclaimer & Limitation of Liability + +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. +No recommendation as to products or vendors is made or should be implied. + +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. +NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER. + +--> +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified"> + + <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" /> + + <xs:element name="accessControlPolicy"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit Announceable Attributes from announceableSubordinateResource type --> + <xs:extension base="m2m:announceableSubordinateResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="privileges" type="m2m:privileges" /> + <xs:element name="selfPrivileges" type="m2m:selfPrivileges" /> + + <!-- 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="accessControlPolicyAnnc"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit Announceable Attributes from announceableSubordinateResource type --> + <xs:extension base="m2m:announcedSubordinateResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="privileges" type="m2m:privileges" /> + <xs:element name="selfPrivileges" type="m2m:selfPrivileges" /> + + <!-- 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> + + <!-- TODO: Questions 1. Do we need to give all these types explicit names? 2. Should some or all of these go into CDT-Common + Types or CDT-Enumerations? --> + + <xs:complexType name="privileges"> + <xs:sequence> + <xs:element name="accessControlRule" type="m2m:accessControlRule" minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="selfPrivileges"> + <xs:sequence> + <xs:element name="accessControlRule" type="m2m:accessControlRule" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + + <!-- TODO: Update TS0004 to match this (needs CR) --> + <xs:complexType name="accessControlRule"> + <xs:sequence> + <xs:element name="accessControlOriginators" type="m2m:AnyURIList" /> + <xs:element name="accessControlOperations" type="m2m:accessControlOperationList" /> + <xs:element name="accessControlContexts" type="m2m:accessControlContexts" minOccurs="0" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="accessControlOperationList"> + <xs:sequence> + <xs:element name="accessControlOperation" type="m2m:accessControlOperation" minOccurs="1" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="accessControlContexts"> + <xs:sequence> + <xs:element name="accessControlWindows" type="m2m:accessControlWindows" minOccurs="0" maxOccurs="unbounded" /> + <xs:element name="accessControlIpAddresses" type="m2m:accessControlIpAddresses" minOccurs="0" maxOccurs="unbounded" /> + <xs:element name="accessControlLocationRegions" type="m2m:accessControlLocationRegions" minOccurs="0" + maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="accessControlWindows"> + <xs:sequence> + <xs:element name="accessControlWindow" type="xs:string" minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="accessControlIpAddresses"> + <xs:sequence> + <xs:element name="accessControlIpAddress" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="accessControlLocationRegions"> + <xs:sequence> + <xs:element name="accessControlLocationRegion" type="m2m:accessControlLocationRegion" minOccurs="0" + maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="accessControlLocationRegion"> + <xs:sequence> + <xs:element name="latitude" type="xs:float" minOccurs="0" /> + <xs:element name="longitude" type="xs:float" minOccurs="0" /> + <xs:element name="radius" type="xs:float" minOccurs="0" /> + <xs:element name="countryCode" type="m2m:countryCode" minOccurs="0" /> + </xs:sequence> + </xs:complexType> + + <xs:simpleType name="accessControlOperation"> + <xs:annotation> + <xs:documentation>Shall be considered for access control policy check by the CSE</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:integer"> + <!-- Create --> + <xs:enumeration value="1" /> + <!-- Retrieve --> + <xs:enumeration value="2" /> + <!-- Update --> + <xs:enumeration value="3" /> + <!-- Delete --> + <xs:enumeration value="4" /> + <!-- Notify --> + <xs:enumeration value="5" /> + <!-- Discover --> + <xs:enumeration value="6" /> + </xs:restriction> + </xs:simpleType> + + <!-- TODO: update this --> + <xs:simpleType name="countryCode"> + <xs:annotation> + <xs:documentation>2-character country code </xs:documentation> + </xs:annotation> + <xs:restriction base="xs:integer"> + <!-- India --> + <xs:enumeration value="91" /> + <!-- United States of America --> + <xs:enumeration value="01" /> + </xs:restriction> + </xs:simpleType> + + +</xs:schema> diff --git a/CDT-commonTypes-v0_8_0.xsd b/CDT-commonTypes-v0_8_0.xsd index b554bd7656d78a59ec4df5ca79f02b757306e7fb..0c8956f86b192883fc463478d491c1c38176010b 100644 --- a/CDT-commonTypes-v0_8_0.xsd +++ b/CDT-commonTypes-v0_8_0.xsd @@ -23,9 +23,16 @@ 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"> + xmlns:m2m="http://www.onem2m.org/xml/protocols" + xmlns:xs="http://www.w3.org/2001/XMLSchema" + elementFormDefault="unqualified" > <xs:include schemaLocation="CDT-enumerationTypes-v0_8_0.xsd" /> + + <xs:simpleType name="timestamp"> + <xs:restriction base="xs:dateTime" /> + </xs:simpleType> + <xs:simpleType name="extendedCrontab"> <xs:restriction base="xs:string"> @@ -38,10 +45,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:list itemType="m2m:extendedCrontab" /> </xs:simpleType> +<!-- TODO: sort out id vs ID, and choose appropriate definitions for the id types (xs:token is placeholder for now) --> <xs:simpleType name="ID"> <xs:restriction base="xs:token"> </xs:restriction> </xs:simpleType> + + <xs:simpleType name="nodeID"> + <xs:restriction base="xs:token"> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="requestID"> + <xs:restriction base="xs:token"> + </xs:restriction> + </xs:simpleType> <xs:simpleType name="nhURI"> <xs:restriction base="xs:anyURI" /> @@ -283,5 +301,125 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="execReqArg" type="m2m:execReqArgsType" minOccurs="0" maxOccurs="unbounded" /> </xs:sequence> </xs:complexType> + + <xs:complexType name="deliveryMetaData"> + <xs:sequence> + + </xs:sequence> + </xs:complexType> + + <xs:complexType name="content" > + <xs:sequence> + <xs:any namespace="http://www.onem2m.org/xml/protocols" + processContents="lax" minOccurs="0" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + +<!-- TODO: reconcile this with PRO-2014-0562-Implementation_of_Filter_Criteria_as_concept --> + <xs:complexType name="filterCriteria"> + <xs:sequence> + <xs:element name="createdBefore" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="createdAfter" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="modifiedSince" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="unmodifiedSince" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="stateTagSmaller" type="xs:positiveInteger" minOccurs="0" /> + <xs:element name="stateTagBigger" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="labels" type="m2m:labels" minOccurs="0" /> + <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" /> + <xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" /> + <xs:element name="contentType" type="xs:string" minOccurs="0" maxOccurs="unbounded" /> + <xs:element name="limit" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="attribute" minOccurs="0" maxOccurs="unbounded"> + <xs:complexType> + <xs:sequence> + <xs:element name="name" type="xs:NCName" /> + <xs:element name="value" type="xs:anyType" /> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="filterUsage" type="m2m:filterUsage" minOccurs="0" /> + </xs:sequence> + </xs:complexType> +<!-- TODO: consider moving this to the Enumerations file --> + <xs:simpleType name="filterUsage"> + <xs:annotation> + <xs:documentation></xs:documentation> + </xs:annotation> + <xs:restriction base="xs:integer"> + <!-- Discovery Criteria --> + <xs:enumeration value="1" /> + <!-- Event Notification Criteria --> + <xs:enumeration value="2" /> + </xs:restriction> + </xs:simpleType> + + <xs:complexType name="metaInformation"> + <xs:sequence> + <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" /> + <xs:element name="name" type="xs:string" minOccurs="0" /> + <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="requestMessageExpirationTimestamp" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="operationalExecutionTime" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="responseMessageType" type="m2m:responseType" minOccurs="0" /> + <xs:element name="responsePersistence" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="resultContent" type="m2m:resultContent" minOccurs="0" /> + <xs:element name="eventCategory" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="eventCatType" type="m2m:eventCatType" /> + <xs:element name="eventCatNo" type="xs:nonNegativeInteger" /> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" /> + <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" /> + <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" /> + <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0" /> + <xs:element name="role" type="xs:string" minOccurs="0" /> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="aggregatedRequest"> + <xs:sequence> + <xs:element name="request" maxOccurs="unbounded"> + <xs:complexType> + <xs:sequence> + <xs:element name="operation" type="m2m:operation" /> + <xs:element name="to" type="xs:anyURI" /> + <xs:element name="from" type="m2m:ID" /> + <xs:element name="requestIdentifier" type="m2m:requestID" /> + <xs:element name="content" type="m2m:content" minOccurs="0" /> + <xs:element name="metaInformation" type="m2m:metaInformation" minOccurs="0" /> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + + <!-- TODO: is this a sensible order? --> + <xs:complexType name="operationResult"> + <xs:sequence> + <xs:element name="content" type="m2m:content" minOccurs="0" /> + <xs:element name="eventCategory" type="m2m:eventCatType" minOccurs="0" /> + <xs:element name="from" type="m2m:ID" minOccurs="0"/> + <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/> + <xs:element name="requestIdentifier" type="m2m:requestID" /> + <xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="to" type="xs:anyURI" minOccurs="0" /> + <xs:element name="responseStatusCode" type="m2m:responseStatus" /> + </xs:sequence> + </xs:complexType> + + <!-- TODO: cardinality of description --> + <xs:complexType name="responseStatus"> + <xs:sequence> + <xs:element name="code" type="m2m:statusCode" /> + <xs:element name="description" type="m2m:eventCatType" /> + </xs:sequence> + </xs:complexType> </xs:schema> diff --git a/CDT-delivery-v0_8_0.xsd b/CDT-delivery-v0_8_0.xsd new file mode 100644 index 0000000000000000000000000000000000000000..666a10995bd6bbb62af70592b0aeef31c7cead20 --- /dev/null +++ b/CDT-delivery-v0_8_0.xsd @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright Notification + +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices +contained in the original materials on any copies of the materials and that you comply strictly with these terms. +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. +© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved. + +Notice of Disclaimer & Limitation of Liability + +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. +No recommendation as to products or vendors is made or should be implied. + +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. +NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER. + +--> + +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" /> + + + <xs:element name="delivery"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes --> + <xs:extension base="m2m:regularResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <!-- TODO: The type of source and target should match that of CSE-ID (i.e.they should have type m2m:ID) --> + <xs:element name="source" type="xs:anyURI" /> + <xs:element name="target" type="xs:anyURI" /> + <xs:element name="lifespan" type="xs:dateTime" /> + <xs:element name="eventCat" type="m2m:eventCat" /> + <xs:element name="deliveryMetaData" type="m2m:deliveryMetaData" /> + <xs:element name="aggregatedRequest" type="m2m:aggregatedRequest" /> + + <!-- 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:subscription"></xs:element> + </xs:choice> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> +</xs:schema> \ No newline at end of file diff --git a/CDT-locationPolicy-v0_8_0.xsd b/CDT-locationPolicy-v0_8_0.xsd new file mode 100644 index 0000000000000000000000000000000000000000..75bc849027393b7f078aafac16acb4d937cdf2a9 --- /dev/null +++ b/CDT-locationPolicy-v0_8_0.xsd @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright Notification + +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices +contained in the original materials on any copies of the materials and that you comply strictly with these terms. +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. +© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved. + +Notice of Disclaimer & Limitation of Liability + +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. +No recommendation as to products or vendors is made or should be implied. + +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. +NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER. + +--> + +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" /> + + <xs:element name="locationPolicy"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes for announceable Resources --> + <xs:extension base="m2m:announceableResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="locationSource" type="m2m:locationSource" /> + <xs:element name="locationUpdatePeriod" type="xs:duration" minOccurs="0" /> + <xs:element name="locationTargetID" type="m2m:nodeID" minOccurs="0" /> + <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: verify that xs:string is really the best type for locationStatus --> + <xs:element name="locationStatus" type="xs:string" /> + + <!-- 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:subscription"></xs:element> + </xs:choice> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="locationPolicyAnnc"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes for announced Resources --> + <xs:extension base="m2m:announcedResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="locationSource" type="m2m:locationSource" /> + <xs:element name="locationUpdatePeriod" type="xs:duration" minOccurs="0" /> + <xs:element name="locationTargetID" type="m2m:nodeID" minOccurs="0" /> + <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: verify that xs:string is really the best type for locationStatus --> + <xs:element name="locationStatus" type="xs:string" /> + + <!-- No Child Resources --> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> +</xs:schema> \ No newline at end of file diff --git a/CDT-remoteCSE-v0_8_0.xsd b/CDT-remoteCSE-v0_8_0.xsd new file mode 100644 index 0000000000000000000000000000000000000000..9306c555795e9ffb90ec1da5f6aecaadb94c1847 --- /dev/null +++ b/CDT-remoteCSE-v0_8_0.xsd @@ -0,0 +1,116 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright Notification + +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices +contained in the original materials on any copies of the materials and that you comply strictly with these terms. +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. +© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved. + +Notice of Disclaimer & Limitation of Liability + +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. +No recommendation as to products or vendors is made or should be implied. + +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. +NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER. + +--> +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> + + <xs:include schemaLocation="CDT-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:element name="remoteCSE"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes for announceable Resources --> + <xs:extension base="m2m:announceableResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="cseType" type="m2m:cseTypeID" minOccurs="0" /> + <xs:element name="pointOfAccess" type="m2m:pOAList" minOccurs="0" /> + <xs:element name="CSEBase" type="xs:anyURI" /> + <!-- TODO: update TS-0004 to say m2m:ID not m2m:id --> + <xs:element name="CSE-ID" type="m2m:ID" /> + <xs:element name="M2M-Ext-ID" type="m2m:externalId" minOccurs="0" /> + <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" /> + + <!-- 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:node" /> + <xs:element ref="m2m:AE" /> + <xs:element ref="m2m:container" /> + <xs:element ref="m2m:group" /> + <xs:element ref="m2m:accessControlPolicy" /> + <xs:element ref="m2m:subscription" /> + <xs:element ref="m2m:pollingChannel" /> + <xs:element ref="m2m:schedule" /> + </xs:choice> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="remoteCSEAnnc"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes for announced Resources --> + <xs:extension base="m2m:announcedResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="cseType" type="m2m:cseTypeID" minOccurs="0" /> + <xs:element name="pointOfAccess" type="m2m:pOAList" minOccurs="0" /> + <xs:element name="CSEBase" type="xs:anyURI" /> + <!-- TODO: update TS-0004 to say m2m:ID not m2m:id --> + <xs:element name="CSE-ID" type="m2m:ID" /> + <xs:element name="requestReachability" type="xs:boolean" /> + <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> + + <!-- Child Resources --> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> + <xs:choice minOccurs="1" maxOccurs="unbounded"> + <xs:element ref="m2m:nodeAnnc" /> + <xs:element ref="m2m:AE" /> + <xs:element ref="m2m:AEAnnc" /> + <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:scheduleAnnc" /> + </xs:choice> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + +</xs:schema> diff --git a/CDT-request-v0_8_0.xsd b/CDT-request-v0_8_0.xsd new file mode 100644 index 0000000000000000000000000000000000000000..570f184623194cca4deeeb1138f6120138ff4e31 --- /dev/null +++ b/CDT-request-v0_8_0.xsd @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Copyright Notification + +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices +contained in the original materials on any copies of the materials and that you comply strictly with these terms. +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document. +© 2014, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TTA, TTC). All rights reserved. + +Notice of Disclaimer & Limitation of Liability + +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations. +No recommendation as to products or vendors is made or should be implied. + +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE, +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS. +NO oneM2M PARTNER TYPE 1 SHALL BE LIABLE, BEYOND THE AMOUNT OF ANY SUM RECEIVED IN PAYMENT BY THAT PARTNER FOR THIS DOCUMENT, WITH RESPECT TO +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES. +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER. + +--> + +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + + <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> + <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" /> + + <xs:element name="request"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes --> + <xs:extension base="m2m:regularResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="operation" type="m2m:operation" /> + <xs:element name="target" type="xs:anyURI" /> + <xs:element name="originator" type="xs:anyURI" /> + <xs:element name="requestIdentifier" type="m2m:requestID" /> + <xs:element name="metaInformation" type="m2m:metaInformation" /> + <xs:element name="primitiveContent" type="m2m:content" /> + <xs:element name="requestStatus" type="m2m:requestStatus" /> + <xs:element name="operationResult" type="m2m:operationResult" /> + + <!-- 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:subscription"></xs:element> + </xs:choice> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> +</xs:schema> \ No newline at end of file diff --git a/CDT-subscription-v0_8_0.xsd b/CDT-subscription-v0_8_0.xsd index 1837ce55d1352afe699b8067ba9dbbce47f6ce78..8a9acf85592cec4ba75913bf45baf45751d538fb 100644 --- a/CDT-subscription-v0_8_0.xsd +++ b/CDT-subscription-v0_8_0.xsd @@ -66,6 +66,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:complexType> </xs:element> + <!-- If this used by anything other than <subscription> it might be better placed in the CommonTypes XSD file --> <xs:complexType name="eventNotificationCriteria"> <xs:sequence> <xs:element name="createdBefore" type="xs:dateTime" minOccurs="0" />