Commit 45c0f8f4 authored by Wolfgang Granzow's avatar Wolfgang Granzow

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

See PRO-2018-0197 for the detailed list of changes.
parent 76063b59
......@@ -39,6 +39,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-multimediaSession-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-triggerRequest-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transactionMgmt-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
......@@ -81,6 +83,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:multimediaSession" />
<xs:element ref="m2m:crossResourceSubscription" />
<xs:element ref="m2m:triggerRequest" />
<xs:element ref="m2m:transactionMgmt" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
......@@ -135,6 +139,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:multimediaSessionAnnc" />
<xs:element ref="m2m:crossResourceSubscription" />
<xs:element ref="m2m:triggerRequest" />
<xs:element ref="m2m:transactionMgmt" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
......@@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
......@@ -47,6 +47,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:AEContactListPerCSE" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
......@@ -55,6 +55,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-AEContactList-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-localMulticastGroup-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-backgroundDataTransfer-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transactionMgmt-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
......@@ -111,6 +114,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:AEContactList" />
<xs:element ref="m2m:localMulticastGroup" />
<xs:element ref="m2m:crossResourceSubscription" />
<xs:element ref="m2m:backgroundDataTransfer" />
<xs:element ref="m2m:transactionMgmt" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
......@@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd"/>
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd"/>
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
......@@ -42,9 +43,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"
maxOccurs="unbounded"/>
<xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
......@@ -64,11 +67,14 @@ 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"
maxOccurs="unbounded"/>
<xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
......
......@@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
......@@ -79,9 +80,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"
maxOccurs="unbounded"/>
<xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
......
......@@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-role-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-token-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
......@@ -68,6 +69,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:role" />
<xs:element ref="m2m:token" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
......@@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
......@@ -43,9 +44,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"
maxOccurs="unbounded"/>
<xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
......
<?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_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:element name="backgroundDataTransfer" 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" minOccurs="0" />
<!-- Resource Specific Attributes -->
<xs:element name="volumePerNode" type="xs:positiveInteger" />
<xs:element name="numberOfNodes" type="xs:positiveInteger" />
<xs:element name="desiredTimeWindow" type="m2m:scheduleEntry" minOccurs="0" />
<xs:element name="transferSelectionGuidance" type="m2m:transferSelectionGuidance" minOccurs="0" />
<xs:element name="geographicInformation" type="m2m:locationRegion" minOccurs="0" />
<xs:element name="groupLink" type="xs:anyURI" minOccurs="0" />
<xs:element name="memberIDs" minOccurs="0" >
<xs:simpleType>
<xs:list itemType="xs:anyURI"/>
</xs:simpleType>
</xs:element>
<!-- 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>
......@@ -359,9 +359,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="scheduleEntry">
<xs:restriction base="xs:string">
<xs:pattern
value="(([*]|[1-5]?\d([,\-/][1-5]?\d)*)\s+){2}([*]|((1?\d|2[0-3])([,\-/](1?\d|2[0-3]))*))\s+([*]|(([1-9]|1\d|2\d|3[01])([,\-/]([1-9]|1\d|2\d|3[01]))*))\s+([*]|(([1-9]|1[0-2])([,\-/]([1-9]|1[0-2]))*))\s+([*]|([0-6]([,\-/][0-6])*))\s+([*]|([2-9]\d\d\d)(([,-]([2-9]\d\d\d)([/][\d]?[\d]?[\d]?[\d])?)*))" />
</xs:restriction>
<xs:pattern value="(((([*]|(([1-5]?\d)\-([1-5]?\d)))(\/([1-5]?\d))?|([1-5]?\d))\,)*((([*]|(([1-5]?\d)\-([1-5]?\d)))(\/([1-5]?\d))?)|([1-5]?\d))\s+){2}((([*]|((1?\d|2[0-3])\-(1?\d|2[0-3])))(\/1?\d|2[0-3])?|(1?\d|2[0-3]))\,)*((([*]|((1?\d|2[0-3])\-(1?\d|2[0-3])))(\/1?\d|2[0-3])?)|(1?\d|2[0-3]))\s+((([*]|(([1-9]|1\d|2\d|3[01])\-([1-9]|1\d|2\d|3[01])))(\/[1-9]|1\d|2\d|3[01])?|([1-9]|1\d|2\d|3[01]))\,)*((([*]|(([1-9]|1\d|2\d|3[01])\-([1-9]|1\d|2\d|3[01])))(\/[1-9]|1\d|2\d|3[01])?)|([1-9]|1\d|2\d|3[01]))\s+((([*]|(([1-9]|1[0-2])\-([1-9]|1[0-2])))(\/[1-9]|1[0-2])?|([1-9]|1[0-2]))\,)*((([*]|(([1-9]|1[0-2])\-([1-9]|1[0-2])))(\/[1-9]|1[0-2])?)|([1-9]|1[0-2]))\s+((([*]|(([0-6])\-([0-6])))(\/[0-6])?|([0-6]))\,)*((([*]|(([0-6])\-([0-6])))(\/[0-6])?)|([0-6]))\s+((([*]|(([2-9]\d\d\d)\-([2-9]\d\d\d)))(\/\d?\d?\d?\d)?|([2-9]\d\d\d))\,)*((([*]|(([2-9]\d\d\d)\-([2-9]\d\d\d)))(\/\d?\d?\d?\d)?)|([2-9]\d\d\d))" /> </xs:restriction>
</xs:simpleType>
<xs:simpleType name="listOfURIs">
......@@ -511,9 +509,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType>
<xs:simpleType name="resourceList" >
<xs:list itemType="xs:anyURI" />
<xs:list itemType="xs:anyURI" />
</xs:simpleType>
<!--********************** -->
......
......@@ -31,6 +31,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
......@@ -61,6 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
......@@ -101,6 +103,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:sg_announcedFlexContainerResource" />
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:timeSeriesAnnc" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
......@@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
......@@ -47,8 +48,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" maxOccurs="unbounded" />
<xs:element ref="m2m:semanticDescriptor" maxOccurs="unbounded" />
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
......@@ -71,8 +75,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" maxOccurs="unbounded" />
<xs:element ref="m2m:semanticDescriptor" maxOccurs="unbounded" />
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
......
......@@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
......@@ -40,8 +41,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- 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="regularResourcesAsTarget" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="subscriptionResourcesAsTarget" type="m2m:listOfURIs" 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" />
......@@ -60,6 +61,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:schedule" />
<xs:element ref="m2m:notificationTargetMgmtPolicyRef" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
......@@ -27,6 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
......@@ -39,7 +41,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="dynamicAuthorizationPoA" type="m2m:listOfURIs" />
<xs:element name="dynamicAuthorizationLifetime" type="m2m:timestamp" minOccurs="0" />
<!-- This Resource Type has no Child Resources -->
<!-- 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 ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
......@@ -126,7 +126,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- triggerRequest -->
<xs:enumeration value="47" />
<!-- crossResourceSubscription -->
<xs:enumeration value="48" />
<xs:enumeration value="48" />
<!-- backgroundDataTransfer -->
<xs:enumeration value="49" />
<!-- transactionMgmt -->
<xs:enumeration value="50" />
<!-- transaction -->
<xs:enumeration value="51" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
......@@ -247,6 +253,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="3" />
<!-- flexBlocking -->
<xs:enumeration value="4" />
<!-- noResponse -->
<xs:enumeration value="5" />
</xs:restriction>
</xs:simpleType>
......@@ -320,7 +328,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- OPERATION_NOT_ALLOWED -->
<xs:enumeration value="4005" />
<!-- REQUEST_TIMEOUT -->
<xs:enumeration value="4008" />
<xs:enumeration value="4008" />
<!-- UNSUPPORTED_MEDIA_TYPE -->
<xs:enumeration value="4015" />
<!-- SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE -->
<xs:enumeration value="4101" />
<!-- CONTENTS_UNACCEPTABLE -->
......@@ -337,6 +347,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="4107" />
<!-- INVALID_CHILD_RESOURCE_TYPE -->
<xs:enumeration value="4108" />
<!-- UNSUPPORTED_MEDIA_TYPE -->
<xs:enumeration value="4015" />
<!-- NO_MEMBERS -->
<xs:enumeration value="4109" />
<!-- GROUP_MEMBER_TYPE_INCONSISTENT -->
......@@ -365,6 +377,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="4121" />
<!-- INVALID_TRIGGER_PURPOSE -->
<xs:enumeration value="4122" />
<!-- ILLEGAL_TRANSACTION_STATE_TRANSITION_ATTEMPTED -->
<xs:enumeration value="4123" />
<!-- INTERNAL_SERVER_ERROR -->
<xs:enumeration value="5000" />
<!-- NOT_IMPLEMENTED -->
......@@ -381,7 +395,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="5204" />
<!-- SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE -->
<xs:enumeration value="5205" />
<!-- NON_BLOCKING_REQUEST_NOT_SUPPORTED -->
<!-- NON_BLOCKING_SYNCH_REQUEST_NOT_SUPPORTED -->
<xs:enumeration value="5206" />
<!-- NOT_ACCEPTABLE -->
<xs:enumeration value="5207" />
......@@ -411,7 +425,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- UNABLE_TO_RECALL_TRIGGER_REQUEST -->
<xs:enumeration value="5220" />
<!-- CROSS_RESOURCE_OPERATION_FAILURE -->
<xs:enumeration value="5221" />
<xs:enumeration value="5221" />
<!-- TRANSACTION_PROCESSING_IS_INCOMPLETE -->
<xs:enumeration value="5222" />
<!-- SPARQL_UPDATE_ERROR -->
<xs:enumeration value="6003" />
<!-- EXTERNAL_OBJECT_NOT_FOUND -->
......@@ -456,6 +472,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="3" />
<!-- FORWARDED -->
<xs:enumeration value="4" />
<!-- PARTIALLY_COMPLETED -->
<xs:enumeration value="5" />
</xs:restriction>
</xs:simpleType>
......@@ -559,6 +577,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="47" />
<!-- crossResourceSubscription -->
<xs:enumeration value="48" />
<!-- backgroundDataTransfer -->
<xs:enumeration value="49" />
<!-- transactionMgmt -->
<xs:enumeration value="50" />
<!-- transaction -->
<xs:enumeration value="51" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
......@@ -1515,6 +1539,91 @@ 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="transferSelectionGuidance">
<xs:annotation>
<xs:documentation>Used for transferSelectionGuidance attribute in backgroundDataTransfer resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- lowestCost -->
<xs:enumeration value="1" />
<!-- bestDataRates -->
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="transactionMode">
<xs:annotation>
<xs:documentation>Used for the transactionMode attribute in transactionMgmt resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- CSE_CONTROLLED -->
<xs:enumeration value="1" />
<!-- CREATOR_CONTROLLED -->
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="transactionControl">
<xs:annotation>
<xs:documentation>Used for the transactionState attribute in transactionMgmt and transaction resource to monitor the state of a transaction.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- INITIAL -->
<xs:enumeration value="1" />
<!-- LOCK -->
<xs:enumeration value="2" />
<!-- EXECUTE -->
<xs:enumeration value="3" />
<!-- COMMIT -->
<xs:enumeration value="4" />
<!-- ABORT -->
<xs:enumeration value="5" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="transactionState">
<xs:annotation>
<xs:documentation>Used for the transactionState attribute in transactionMgmt and transaction resource to monitor the state of a transaction.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- INITIAL -->
<xs:enumeration value="1" />
<!-- LOCKED -->
<xs:enumeration value="2" />
<!-- EXECUTED -->
<xs:enumeration value="3" />
<!-- COMMITTED -->
<xs:enumeration value="4" />
<!-- ERROR -->
<xs:enumeration value="5" />
<!-- ABORTED -->
<xs:enumeration value="6" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="transactionLockType">
<xs:annotation>
<xs:documentation>Used for the transactionMode attribute in transactionMgmt resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- BLOCK_ALL -->
<xs:enumeration value="1" />
<!-- ALLOW_RETRIEVES -->
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="transactionMgmtHandling">
<xs:annotation>
<xs:documentation>Used for the transactionMode attribute in transactionMgmt resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- DELETE -->
<xs:enumeration value="1" />
<!-- PERSIST -->
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
</xs:schema>
......@@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
......@@ -51,8 +52,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" maxOccurs="unbounded" />
<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
......
......@@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
......@@ -48,8 +49,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" maxOccurs="unbounded" />
<xs:element ref="m2m:subscription" maxOccurs="unbounded" />
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
......
......@@ -30,6 +30,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
......@@ -53,6 +55,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
<xs:element name="groupName" type="xs:string" minOccurs="0" />
<xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0" />
<xs:element name="notifyAggregation" type="m2m:batchNotify" minOccurs="0"/>
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......@@ -60,6 +63,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:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
......@@ -88,6 +92,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
<xs:element name="groupName" type="xs:string" minOccurs="0" />
<xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0" />
<xs:element name="notifyAggregation" type="m2m:batchNotify" minOccurs="0"/>
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......@@ -96,6 +101,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:semanticDescriptorAnnc" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
......@@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
......@@ -41,7 +42,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
<xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerID" type="xs:anyURI" />
<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
<xs:element name="locationStatus" type="xs:string" />
<xs:element name="authID" type="m2m:externalID" minOccurs="0" />
......@@ -53,6 +54,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
......@@ -79,7 +81,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="retrieveLastKnownLocation" type="xs:boolean" minOccurs="0" />
<xs:element name="locationUpdateEventCriteria" type="m2m:locationUpdateEventCriteria" minOccurs="0" />
<!-- No Child Resources -->
<!-- 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:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
......@@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-serviceSubscribedNode-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
......@@ -44,6 +45,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:serviceSubscribedNode" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
......@@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-execInstance-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
......@@ -53,6 +54,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:execInstance" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
</xs:sequence>
......
......@@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
......@@ -49,6 +50,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:accessControlPolicy" />
<xs:element ref="m2m:transaction" />