Skip to content

GitLab

Commit 7727e4ca authored by Wolfgang Granzow's avatar Wolfgang Granzow
Browse files

Changes agreed at PRO#34/TP#34 for Rel-3 

See PRO-2018-0119 for a detailed list of changes
parent d63ba4e2
Hide whitespace changes
Inline Side-by-side
Showing with 301 additions and 80 deletions
v3_7_0/CDT-AE-v3_7_0.xsd
View file @ 7727e4ca
......@@ -35,9 +35,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-timeSeries-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-trafficPattern-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-multimediaSession-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-crossResourceSubscription-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-triggerRequest-v3_7_0.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
......@@ -60,6 +61,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
<xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
<xs:element name="sessionCapabilities" type="m2m:sessionCapabilities" minOccurs="0" />
<xs:element name="triggerEnable" type="xs:boolean" minOccurs="0" />
<xs:element name="activityPatternElements" type="m2m:activityPatternElements" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......@@ -73,10 +76,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:schedule" />
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:trafficPattern" />
<xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:semanticMashupInstance" />
<xs:element ref="m2m:multimediaSession" />
<xs:element ref="m2m:crossResourceSubscription" />
<xs:element ref="m2m:triggerRequest" />
</xs:choice>
</xs:choice>
</xs:sequence>
......@@ -105,6 +109,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
<xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
<xs:element name="sessionCapabilities" type="m2m:sessionCapabilities" minOccurs="0" />
<xs:element name="triggerEnable" type="xs:boolean" minOccurs="0" />
<xs:element name="activityPatternElements" type="m2m:activityPatternElements" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......@@ -121,13 +127,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:timeSeriesAnnc" />
<xs:element ref="m2m:trafficPatternAnnc" />
<xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:sg_announcedFlexContainerResource" />
<xs:element ref="m2m:semanticMashupInstance" />
<xs:element ref="m2m:semanticMashupInstanceAnnc" />
<xs:element ref="m2m:multimediaSession" />
<xs:element ref="m2m:multimediaSessionAnnc" />
<xs:element ref="m2m:crossResourceSubscription" />
<xs:element ref="m2m:triggerRequest" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
v3_7_0/CDT-CSEBase-v3_7_0.xsd
View file @ 7727e4ca
......@@ -54,6 +54,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-AEContactList-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-localMulticastGroup-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-crossResourceSubscription-v3_7_0.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
......@@ -109,6 +110,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticMashupInstance" />
<xs:element ref="m2m:AEContactList" />
<xs:element ref="m2m:localMulticastGroup" />
<xs:element ref="m2m:crossResourceSubscription" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
v3_7_0/CDT-commonTypes-v3_7_0.xsd
View file @ 7727e4ca
......@@ -509,6 +509,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="resourceList" >
<xs:list itemType="xs:anyURI" />
</xs:simpleType>
<!--********************** -->
......@@ -616,7 +621,36 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:choice>
</xs:complexType>
<!-- m2m:batchNotify and m2m:eventNotificationCriteria are defined in the subscription resource file -->
<xs:complexType name="eventNotificationCriteria">
<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="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="operationMonitor" type="m2m:operationMonitor" minOccurs="0" maxOccurs="5" />
<xs:element name="attribute" type="m2m:attributeList" minOccurs="0" maxOccurs="1" />
<xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
<xs:element name="childResourceType" minOccurs="0" maxOccurs="1" >
<xs:simpleType>
<xs:restriction>
<xs:simpleType>
<xs:list itemType="m2m:resourceType" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="missingData" type="m2m:missingData" minOccurs="0" />
</xs:sequence>
</xs:complexType>
<!-- m2m:batchNotify is defined in the subscription resource file -->
<xs:complexType name="filterCriteria">
<xs:sequence>
......@@ -1228,7 +1262,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
<!-- data type m2m:operationMonitor is defined in the CDT-subscription XSD file -->
<xs:complexType name="operationMonitor">
<xs:sequence>
<xs:element name="operations" type="m2m:accessControlOperations" minOccurs="0" />
<xs:element name="originator" type="m2m:ID" minOccurs="0" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="dynAuthRelMapRequest">
<xs:sequence>
......@@ -1304,6 +1343,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
<xs:complexType name="activityPatternElements">
<xs:sequence>
<xs:element name="activityPatternElements" type="m2m:activityPattern" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<xs:complexType name="activityPattern">
<xs:sequence>
<xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="1" maxOccurs="unbounded"/>
<xs:element name="stationaryIndication" type="m2m:stationaryIndication" minOccurs="0" />
<xs:element name="dataSizeIndicator" type="xs:positiveInteger" minOccurs="0" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="eventNotificationCriteriaSet">
<xs:sequence>
<xs:element name="eventNotificationCriteriaEntry" type="m2m:eventNotificationCriteria" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<!-- 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
......@@ -1417,6 +1477,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="objectIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="objectPaths" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="description" type="xs:string" minOccurs="0" />
<xs:element name="mgmtSchema" type="xs:anyURI" minOccurs="0" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
......@@ -1430,6 +1491,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="objectIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="objectPaths" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="description" type="xs:string" minOccurs="0" />
<xs:element name="mgmtSchema" type="xs:anyURI" minOccurs="0" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
......@@ -1462,6 +1524,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="creator" type="m2m:ID" minOccurs="0" />
<xs:element name="containerDefinition" type="xs:anyURI" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
<xs:element name="contentSize" type="xs:nonNegativeInteger" />
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
</xs:sequence>
<xs:attribute name="resourceName" type="m2m:resourceName" use="required" />
</xs:complexType>
......@@ -1481,6 +1545,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="containerDefinition" type="xs:anyURI" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
<xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0"/>
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
</xs:sequence>
<xs:attribute name="resourceName" type="m2m:resourceName" use="required" />
</xs:complexType>
......
v3_7_0/CDT-crossResourceSubscription-v3_7_0.xsd 0 → 100644
View file @ 7727e4ca
<?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.
© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, 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-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-schedule-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_7_0.xsd" />
<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes from RegularResource Type -->
<xs:extension base="m2m:regularResource">
<xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
<xs:element name="creator" type="m2m:ID" />
<!-- Resource Specific Attributes -->
<xs:element name="regularResourcesAsTarget" type="m2m:resourceList" minOccurs="0" />
<xs:element name="subscriptionResourcesAsTarget" type="m2m:resourceList" minOccurs="0" />
<xs:element name="timeWindowType" type="m2m:timeWindowType" />
<xs:element name="timeWindowSize" type="m2m:absRelTimestamp" />
<xs:element name="eventNotificationCriteriaSet" type="m2m:eventNotificationCriteriaSet" minOccurs="0" />
<xs:element name="notificationEventCat" type="m2m:eventCat" minOccurs="0" />
<xs:element name="expirationCounter" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="notificationURI" >
<xs:simpleType>
<xs:list itemType="xs:anyURI" />
</xs:simpleType>
</xs:element>
<xs:element name="subscriberURI" type="m2m:ID" 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:schedule" />
<xs:element ref="m2m:notificationTargetMgmtPolicyRef" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
</xs:schema>
v3_7_0/CDT-enumerationTypes-v3_7_0.xsd
View file @ 7727e4ca
......@@ -96,8 +96,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="31" />
<!-- token -->
<xs:enumeration value="32" />
<!-- trafficPattern -->
<xs:enumeration value="33" />
<!-- void: trafficPattern -->
<!-- dynamicAuthorizationConsultation -->
<xs:enumeration value="34" />
<!-- authorizationDecision -->
......@@ -124,6 +123,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="45" />
<!-- multimediaSession -->
<xs:enumeration value="46" />
<!-- triggerRequest -->
<xs:enumeration value="47" />
<!-- crossResourceSubscription -->
<xs:enumeration value="48" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
......@@ -152,8 +155,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10029" />
<!-- timeSeriesInstanceAnnc -->
<xs:enumeration value="10030" />
<!-- trafficPatternAnnc -->
<xs:enumeration value="10033" />
<!-- void: trafficPatternAnnc -->
<!-- dynamicAuthorizationConsultationAnnc -->
<xs:enumeration value="10034" />
<!-- ontologyRepositoryAnnc -->
......@@ -358,7 +360,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- LINKED_SEMANTICS_NOT_AVAILABLE -->
<xs:enumeration value="4119" />
<!-- INVALID_SEMANTICS -->
<xs:enumeration value="4120" />
<xs:enumeration value="4120" />
<!-- MASHUP_MEMBER_NOT_FOUND -->
<xs:enumeration value="4121" />
<!-- INVALID_TRIGGER_PURPOSE -->
<xs:enumeration value="4122" />
<!-- INTERNAL_SERVER_ERROR -->
<xs:enumeration value="5000" />
<!-- NOT_IMPLEMENTED -->
......@@ -389,8 +395,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="5211" />
<!-- SPARQL_UPDATE_ERROR -->
<xs:enumeration value="5212" />
<!-- MASH_UP_OPERATION_FAILED -->
<xs:enumeration value="5213" />
<!-- void: MASH_UP_OPERATION_FAILED -->
<!-- TARGET_HAS_NO_SESSION_CAPABILITY -->
<xs:enumeration value="5214" />
<!-- SESSION_IS_ONLINE -->
......@@ -399,6 +404,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="5216" />
<!-- LEAVE_MULTICAST_GROUP_FAILED -->
<xs:enumeration value="5217" />
<!-- TRIGGERING_DISABLED_FOR_RECIPIENT -->
<xs:enumeration value="5218" />
<!-- UNABLE_TO_REPLACE_TRIGGER_REQUEST -->
<xs:enumeration value="5219" />
<!-- UNABLE_TO_RECALL_TRIGGER_REQUEST -->
<xs:enumeration value="5220" />
<!-- CROSS_RESOURCE_OPERATION_FAILURE -->
<xs:enumeration value="5221" />
<!-- SPARQL_UPDATE_ERROR -->
<xs:enumeration value="6003" />
<!-- EXTERNAL_OBJECT_NOT_FOUND -->
......@@ -517,8 +530,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="31" />
<!-- token -->
<xs:enumeration value="32" />
<!-- trafficPattern -->
<xs:enumeration value="33" />
<!-- void: trafficPattern -->
<!-- dynamicAuthorizationConsultation -->
<xs:enumeration value="34" />
<!-- authorizationDecision -->
......@@ -543,6 +555,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="44" />
<!-- multimediaSession -->
<xs:enumeration value="46" />
<!-- triggerRequest -->
<xs:enumeration value="47" />
<!-- crossResourceSubscription -->
<xs:enumeration value="48" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
......@@ -571,8 +587,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10029" />
<!-- timeSeriesInstanceAnnc -->
<xs:enumeration value="10030" />
<!-- trafficPatternAnnc -->
<xs:enumeration value="10033" />
<!-- void: trafficPatternAnnc -->
<!-- dynamicAuthorizationConsultationAnnc -->
<xs:enumeration value="10034" />
<!-- ontologyRepositoryAnnc -->
......@@ -827,7 +842,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:documentation>This is used for mgmtObj resource.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- unspecified -->
<!-- self-defined -->
<xs:enumeration value="0" />
<!-- firmware -->
<xs:enumeration value="1001" />
......@@ -1253,21 +1268,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="periodicIndicator">
<xs:annotation>
<xs:documentation>Used for periodicIndicator attribute of trafficPattern resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- Periodic -->
<xs:enumeration value="1" />
<!-- On demand -->
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="stationaryIndication">
<xs:annotation>
<xs:documentation>Used for periodicIndicator attribute of trafficPattern resource</xs:documentation>
<xs:documentation>Used for stationaryIndication element attribute of m2m:activityPattern</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- Stationary -->
......@@ -1279,7 +1282,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="contentStatus">
<xs:annotation>
<xs:documentation>Used for periodicIndicator attribute of trafficPattern resource</xs:documentation>
<xs:documentation>Used for Content Status response parameter</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- PARTIAL_CONTENT -->
......@@ -1309,15 +1312,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="triggerPurpose">
<xs:annotation>
<xs:documentation>Used for the triggerPurpose field of trigger requests on Mcn</xs:documentation>
<xs:documentation>Used for the triggerPurpose field of trigger requests on Mcn and for triggerPurpose attribute of the triggerRequest resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- establishConnection -->
<xs:enumeration value="0" />
<!-- registrationRequest -->
<xs:enumeration value="1" />
<!-- executeCRUD -->
<!-- registrationRequest -->
<xs:enumeration value="2" />
<!-- executeCRUD -->
<xs:enumeration value="3" />
<!-- enrolmentRequest -->
<xs:enumeration value="4" />
</xs:restriction>
</xs:simpleType>
......@@ -1467,7 +1472,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="sessionState">
<xs:annotation>
<xs:documentation>Used for sessionState attribute of multimediaSession resource</xs:documentation>
......@@ -1479,6 +1483,38 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="triggerStatus">
<xs:annotation>
<xs:documentation>Used in definining trigger status in the triggerRequest resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- PROCESSING -->
<xs:enumeration value="1" />
<!-- ERROR_NSE_NOT_FOUND -->
<xs:enumeration value="2" />
<!-- TRIGGER_SUBMITTED -->
<xs:enumeration value="3" />
<!-- TRIGGER_DELIVERED -->
<xs:enumeration value="4" />
<!-- TRIGGER_EXPIRED -->
<xs:enumeration value="5" />
<!-- TRIGGER_FAILED -->
<xs:enumeration value="6" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="timeWindowType">
<xs:annotation>
<xs:documentation>Used for timeWindowType attribute in crossResourceSubscription resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- PERIODICWINDOW -->
<xs:enumeration value="1" />
<!-- SLIDINGWINDOW -->
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
</xs:schema>
v3_7_0/CDT-node-v3_7_0.xsd
View file @ 7727e4ca
......@@ -42,7 +42,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-activeCmdhPolicy-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-trafficPattern-v3_7_0.xsd" />
<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
......@@ -55,7 +54,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
<xs:element name="hostedAELinks" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="hostedServiceLinks" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" />
<xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" />
<xs:element name="roamingStatus" type="xs:boolean" minOccurs="0" />
<xs:element name="networkID" type="xs:string" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......@@ -75,7 +76,6 @@ 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>
......@@ -96,6 +96,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="hostedAELinks" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="hostedServiceLinks" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" />
<xs:element name="roamingStatus" type="xs:boolean" minOccurs="0" />
<xs:element name="networkID" type="xs:string" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......@@ -114,7 +116,6 @@ 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>
......
v3_7_0/CDT-remoteCSE-v3_7_0.xsd
View file @ 7727e4ca
......@@ -40,8 +40,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-ontologyRepository-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-semanticMashupInstance-v3_7_0.xsd" />
<xs:include schemaLocation="CDT-crossResourceSubscription-v3_7_0.xsd" />
<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
......@@ -65,6 +64,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
<xs:element name="multicastCapability" type="m2m:multicastCapability" minOccurs="0" />
<xs:element name="externalGroupID" type="m2m:externalID" minOccurs="0" />
<xs:element name="triggerEnable" type="xs:boolean" minOccurs="0" />
<xs:element name="activityPatternElements" type="m2m:activityPatternElements" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......@@ -91,6 +92,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticMashupJobProfileAnnc" />
<xs:element ref="m2m:semanticMashupInstance" />
<xs:element ref="m2m:semanticMashupInstanceAnnc" />
<xs:element ref="m2m:crossResourceSubscription" />
</xs:choice>
</xs:choice>
</xs:sequence>
......@@ -118,6 +120,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
<xs:element name="multicastCapability" type="m2m:multicastCapability" minOccurs="0" />
<xs:element name="externalGroupID" type="m2m:externalID" minOccurs="0" />
<xs:element name="triggerEnable" type="xs:boolean" minOccurs="0" />
<xs:element name="activityPatternElements" type="m2m:activityPatternElements" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......@@ -144,6 +148,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticMashupJobProfileAnnc" />
<xs:element ref="m2m:semanticMashupInstance" />
<xs:element ref="m2m:semanticMashupInstanceAnnc" />
<xs:element ref="m2m:crossResourceSubscription" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
v3_7_0/CDT-responsePrimitive-v3_7_0.xsd
View file @ 7727e4ca
......@@ -119,7 +119,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resource" type="m2m:resourceWrapper" />
<xs:element name="URIList" type="m2m:listOfURIs" />
<xs:element name="URIList" >
<xs:simpleType>
<xs:list itemType="xs:anyURI" />
</xs:simpleType>
</xs:element>
<xs:element name="URI" type="xs:anyURI" />
......
v3_7_0/CDT-statsCollect-v3_7_0.xsd
View file @ 7727e4ca
......@@ -40,7 +40,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:element name="statsCollectID" type="xs:string" />
<xs:element name="collectingEntityID" type="m2m:ID" />
<xs:element name="collectedEntityID" type="m2m:ID" />
<xs:element name="collectedEntityID" type="m2m:listOfM2MID" />
<xs:element name="statsRuleStatus" type="m2m:statsRuleStatusType" />
<xs:element name="statModel" type="m2m:statModelType" />
<xs:element name="collectPeriod" type="m2m:scheduleEntries" minOccurs="0" />
......
v3_7_0/CDT-subscription-v3_7_0.xsd
View file @ 7727e4ca
......@@ -54,6 +54,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="notificationContentType" type="m2m:notificationContentType" />
<xs:element name="notificationEventCat" type="m2m:eventCat" minOccurs="0" />
<xs:element name="subscriberURI" type="xs:anyURI" minOccurs="0" />
<xs:element name="associatedCrossResourceSub" type="m2m:resourceList" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......@@ -69,42 +70,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
<xs:complexType name="eventNotificationCriteria">
<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="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="operationMonitor" type="m2m:operationMonitor" minOccurs="0" maxOccurs="5" />
<xs:element name="attribute" type="m2m:attributeList" minOccurs="0" maxOccurs="1" />
<xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
<xs:element name="childResourceType" minOccurs="0" maxOccurs="1" >
<xs:simpleType>
<xs:restriction>
<xs:simpleType>
<xs:list itemType="m2m:resourceType" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="missingData" type="m2m:missingData"