Skip to content

GitLab

Commit 15710134 authored by Wolfgang Granzow's avatar Wolfgang Granzow
Browse files

Changes agreed at PRO#23 (second part) 

see detailed list of CRs and changes in
PRO-2016-0226-PRO23_changes_of_XML_schemas_to_align_with_TS-0004
parent c357b810
Hide whitespace changes
Inline Side-by-side
Showing with 551 additions and 40 deletions
v2_6_0/CDT-CSEBase-v2_6_0.xsd
View file @ 15710134
......@@ -43,7 +43,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-schedule-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-role-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-token-v2_6_0.xsd" />
<xs:element name="CSEBase">
<xs:complexType>
<xs:complexContent>
......@@ -82,6 +85,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:schedule" />
<xs:element ref="m2m:m2mServiceSubscriptionProfile" />
<xs:element ref="m2m:serviceSubscribedAppRule" />
<xs:element ref="m2m:role" />
<xs:element ref="m2m:token" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
v2_6_0/CDT-commonTypes-v2_6_0.xsd
View file @ 15710134
......@@ -214,6 +214,36 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:union>
</xs:simpleType>
<xs:simpleType name="missingDataList">
<xs:union>
<simpleType>
<restriction base='m2m:listOfTimeStamp' />
</simpleType>
<simpleType>
<restriction base='m2m:listOfRelTimeStamp' />
</simpleType>
</xs:union>
</xs:simpleType>
<!-- auxiliary data type required for definition of m2m:missingDataList -->
<xs:simpleType name="listOfTimeStamp">
<xs:restriction>
<xs:simpleType>
<xs:list itemType="m2m:timestamp" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
<!-- auxiliary data type required for definition of m2m:missingDataList -->
<xs:simpleType name="listOfRelTimeStamp">
<xs:restriction>
<xs:simpleType>
<xs:list itemType="xs:long" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="typeOfContent">
<xs:restriction base="xs:string">
......@@ -336,7 +366,31 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:pattern value="application\/rdf\+xml\:1" />
</xs:restriction>
</xs:simpleType>
<!-- NOTE: following data types are proposed in PRO-2014-0183R0x which is not agreed yet -->
<!-- These are required to enable validation of data type m2m:dynAuthJWT defined in agreed
contribution PRO-2016-0154R03 used in <token> resource,
request and response primitive. Fefinitions to be reviewed after approval -->
<xs:simpleType name="e2eCompactJWS">
<xs:restriction base="xs:string" />
</xs:simpleType>
<xs:simpleType name="e2eCompactJWE">
<xs:restriction base="xs:string" />
</xs:simpleType>
<xs:simpleType name="dynAuthJWT">
<xs:union>
<!-- absolute Time -->
<xs:simpleType>
<xs:restriction base='m2m:e2eCompactJWS' />
</xs:simpleType>
<!-- relative Time -->
<xs:simpleType>
<xs:restriction base='m2m:e2eCompactJWE' />
</xs:simpleType>
</xs:union>
</xs:simpleType>
<!--********************** -->
<!-- oneM2M Complex Types -->
......@@ -694,9 +748,107 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<xs:complexType name="missingData">
<xs:sequence>
<xs:element name="number" type="xs:nonNegativeInteger" minOccurs="1" />
<xs:element name="duration" type="xs:duration" minOccurs="1" />
</xs:sequence>
</xs:complexType>
<!-- m2m:securityInfo, m2m:dynAuthDasRequest, m2m:dynAuthDasRequest, m2m:dynAuthDasResponse, m2m:receiverE2ERandObject
m2m:eSPrimObject and m2m:dynAuthDasRequest are in the CDT-notification xsd file -->
<xs:complexType name="tokenPermission">
<xs:sequence>
<xs:element name="resourceIDs" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="privileges" type="m2m:setOfAcrs" minOccurs="0" />
<xs:element name="roleIDs" minOccurs="0">
<xs:simpleType>
<xs:restriction>
<xs:simpleType>
<xs:list itemType="m2m:roleID" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
<!--
<xs:complexType name="tokenObject">
<xs:sequence>
<xs:element name="resourceIDs" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="privileges" type="m2m:setOfAcrs" minOccurs="0" />
<xs:element name="roleIDs" minOccurs="0">
<xs:simpleType>
<xs:restriction>
<xs:simpleType>
<xs:list itemType="m2m:roleID" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
version xs:string 1
tokenID m2m:tokenID 1
holder m2m:ID 1
issuer m2m:ID 1
notBefore m2m:timestamp 1
notAfter m2m:timestamp 1
tokenName xs:string 0..1
audience list of m2m:ID 0..1
permissions List of m2m:tokenPermission 0..1
extension xs:string 0..1
-->
<xs:complexType name="dynAuthLocalTokenIdAssignments">
<xs:sequence>
<xs:element name="localTokenIdAssignment" minOccurs="1" maxOccurs="unbounded" >
<complexType>
<sequence>
<xs:element name="localTokenID" type="xs:NCName" />
<xs:element name="tokenID" type="m2m:tokenID" />
</sequence>
</complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="dynAuthTokenSummary">
<xs:sequence>
<xs:element name="tokenID" type="m2m:tokenID" />
<xs:element name="notBefore" type="m2m:timestamp" />
<xs:element name="notAfter" type="m2m:timestamp" />
<xs:element name="tokenName" type="xs:string" minOccurs="0" />
<xs:element name="audience" type="m2m:listOfM2MID" minOccurs="0" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="dynAuthTokenReqInfo">
<xs:sequence>
<xs:element name="dasInfo" minOccurs="1" maxOccurs="unbounded" >
<complexType>
<sequence>
<xs:element name="URI" type="xs:anyURI" />
<xs:element name="dasRequest" type="m2m:dynAuthDASRequest" minOccurs="0"/>
<xs:element name="securedDASRequest" type="m2m:dynAuthJWT" minOccurs="0"/>
</sequence>
</complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
<!-- dummy data type for missing definition of m2m:dynAuthDASRequest -->
<xs:simpleType name="dynAuthDASRequest">
<xs:restriction base="xs:string" />
</xs:simpleType>
<!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources. Each oneM2M
Resource has a resource type that is defined in a separate schema, but each resource type extends one of the types that is
......
v2_6_0/CDT-container-v2_6_0.xsd
View file @ 15710134
......@@ -59,6 +59,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:container" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:semanticDescriptorAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
v2_6_0/CDT-enumerationTypes-v2_6_0.xsd
View file @ 15710134
......@@ -101,7 +101,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- trafficPattern -->
<xs:enumeration value="34" />
<!-- dynamicAuthorizationConsultation -->
<xs:enumeration value="35" />
<xs:enumeration value="35" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
......@@ -949,33 +949,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="SRole-ID">
<xs:restriction base="xs:token">
<!-- Software Management -->
<xs:enumeration value="01-001" />
<!-- Device Configuration -->
<xs:enumeration value="02-001" />
<!-- Device Diagnostics and Management -->
<xs:enumeration value="02-002" />
<!-- Device Firmware Management -->
<xs:enumeration value="02-003" />
<!-- Device Topology -->
<xs:enumeration value="02-004" />
<!-- Location -->
<xs:enumeration value="03-001" />
<!-- Basic Data -->
<xs:enumeration value="04-001" />
<!-- Onboarding -->
<xs:enumeration value="05-001" />
<!-- Security Administration -->
<xs:enumeration value="06-001" />
<!-- Groups Management -->
<xs:enumeration value="07-001" />
<!-- Event Collection -->
<xs:enumeration value="08-001" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="filterUsage">
<xs:annotation>
<xs:documentation>Used in filterCriteria</xs:documentation>
......
v2_6_0/CDT-group-v2_6_0.xsd
View file @ 15710134
......@@ -89,6 +89,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:semanticDescriptorAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
v2_6_0/CDT-m2mServiceSubscriptionProfile-v2_6_0.xsd
View file @ 15710134
......@@ -37,11 +37,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:regularResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="serviceRoles" minOccurs="0">
<xs:simpleType>
<xs:list itemType="m2m:SRole-ID" />
</xs:simpleType>
</xs:element>
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......
v2_6_0/CDT-node-v2_6_0.xsd
View file @ 15710134
......@@ -105,6 +105,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:eventLogAnnc" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:semanticDescriptorAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
v2_6_0/CDT-notification-v2_6_0.xsd
View file @ 15710134
......@@ -85,6 +85,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</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 -->
......
v2_6_0/CDT-remoteCSE-v2_6_0.xsd
View file @ 15710134
......@@ -35,6 +35,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-schedule-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-node-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-locationPolicy-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-timeSeries-v2_6_0.xsd" />
<xs:element name="remoteCSE">
<xs:complexType>
......@@ -62,6 +63,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:pollingChannel" />
<xs:element ref="m2m:schedule" />
<xs:element ref="m2m:timeSeries" />
</xs:choice>
</xs:choice>
</xs:sequence>
......@@ -99,6 +101,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:pollingChannel" />
<xs:element ref="m2m:scheduleAnnc" />
<xs:element ref="m2m:locationPolicyAnnc" />
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:timeSeriesAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
v2_6_0/CDT-requestPrimitive-v2_6_0.xsd
View file @ 15710134
......@@ -45,8 +45,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
<!-- parameter "Content" -->
<xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/>
<!-- parameter "Role" -->
<xs:element name="role" type="xs:anyType" minOccurs="0"/>
<!-- parameter "Role IDs" -->
<xs:element name="roleIDs" minOccurs="0">
<xs:simpleType>
<xs:restriction>
<xs:simpleType>
<xs:list itemType="m2m:roleID" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<!-- parameter "Originating Timestamp" -->
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
<!-- parameter "Request Expiration Timestamp" -->
......@@ -71,6 +81,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
<!-- parameter "Discovery Result Type" -->
<xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
<!-- parameter "Tokens" -->
<xs:element name="tokens" type="m2m:dynAuthJWT" minOccurs="0"/>
<!-- parameter "Token IDs" -->
<xs:element name="tokenIDs" type="m2m:tokenID" minOccurs="0"/>
<!-- parameter "Local Token IDs" -->
<xs:element name="localTokenIDs" minOccurs="0">
<xs:simpleType>
<xs:restriction>
<xs:simpleType>
<xs:list itemType="xs:NCName" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<!-- parameter "Token Request Indicator" -->
<xs:element name="tokenReqIndicator" type="xs:boolean" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
......
v2_6_0/CDT-responsePrimitive-v2_6_0.xsd
View file @ 15710134
......@@ -73,6 +73,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-statsCollect-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-statsConfig-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-timeSeries-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-timeSeriesInstance-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-role-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-token-v2_6_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>
......@@ -95,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 "Assigned Token Identifiers -->
<xs:element name="assignedTokenIdentifiers" type="m2m:dynAuthLocalTokenIdAssignments" minOccurs="0" />
<!-- parameter "Token Request Information -->
<xs:element name="tokenReqInfo" type="m2m:dynAuthTokenReqInfo" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
......@@ -154,6 +162,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<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:choice>
<xs:element name="URI" type="xs:anyURI" />
</xs:sequence>
......
v2_6_0/CDT-role-v2_6_0.xsd 0 → 100644
View file @ 15710134
<?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 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-subscription-v2_6_0.xsd" />
<xs:element name="role">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:regularResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="roleID" type="m2m:roleID" />
<xs:element name="issuer" type="m2m:ID" />
<xs:element name="holder" type="m2m:ID" />
<xs:element name="notBefore" type="m2m:timestamp" />
<xs:element name="notAfter" type="m2m:timestamp" />
<xs:element name="roleName" type="xs:string" minOccurs="0" />
<xs:element name="tokenLink" 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:subscription" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
</xs:schema>
\ No newline at end of file
v2_6_0/CDT-semanticDescriptor-v2_6_0.xsd
View file @ 15710134
......@@ -33,7 +33,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
<xs:extension base="m2m:regularResource">
<xs:extension base="m2m:announceableResource">
<xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
<xs:element name="creator" type="m2m:ID" minOccurs="0" />
......@@ -54,4 +54,28 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexContent>
</xs:complexType>
</xs:element>
<xs:element name="semanticDescriptorAnnc">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
<xs:extension base="m2m:announcedResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="descriptorRepresentation" type="m2m:descriptorRepresentation" minOccurs="0" />
<xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
<xs:element name="descriptor" type="xs:base64Binary" minOccurs="0" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
<xs:element name="relatedSemantics" type="m2m:listOfURIs" 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>
v2_6_0/CDT-subscription-v2_6_0.xsd
View file @ 15710134
......@@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-schedule-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_6_0.xsd" />
<xs:element name="subscription">
<xs:complexType>
......@@ -56,8 +57,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" />
<xs:element ref="m2m:schedule" />
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:schedule" />
<xs:element ref="m2m:notificationTargetMgmtPolicyRef" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
......@@ -80,6 +84,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="operationMonitor" type="m2m:operation" minOccurs="0" maxOccurs="5" />
<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
<xs:element name="missingData" type="m2m:missingData" minOccurs="0" />
</xs:sequence>
</xs:complexType>
......
v2_6_0/CDT-timeSeries-v2_6_0.xsd 0 → 100644
View file @ 15710134
<?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 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-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-timeSeriesInstance-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_6_0.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor-v2_6_0.xsd" />
<xs:element name="timeSeries">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announceableResource">
<xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" />
<xs:element name="creator" type="m2m:ID" />
<!-- Resource Specific Attributes -->
<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
<xs:element name="currentByteSize" type="xs:nonNegativeInteger" />
<xs:element name="periodicInterval" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="missingDataDetect" type="xs:boolean" minOccurs="0" />
<xs:element name="missingDataMaxNr" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="missingDataList" type="m2m:missingDataList" minOccurs="0" />
<xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="missingDataDetectTimer" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
<!-- Child Resources -->
<xs:element name="latest" type="xs:anyURI" />
<xs:element name="oldest" type="xs:anyURI" />
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:timeSeriesInstance" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
<xs:element name="timeSeriesAnnc">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:announcedResource">
<xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" />
<!-- Resource Specific Attributes -->
<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
<xs:element name="currentByteSize" type="xs:nonNegativeInteger" />