diff --git a/v3_8_0/CDT-AE-v3_8_0.xsd b/v3_8_0/CDT-AE-v3_8_0.xsd index 4447309205d3969bfdec0b9292b08cfbfbee3945..dc6e9edf282f8df775077c43b8d0965b4195bd30 100644 --- a/v3_8_0/CDT-AE-v3_8_0.xsd +++ b/v3_8_0/CDT-AE-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-AEContactList-v3_8_0.xsd b/v3_8_0/CDT-AEContactList-v3_8_0.xsd index da03a23ed66780594c57cf276241d8c976d61aa1..d57eba00acf8e44dbb1a4aade47619bcdb334e5b 100644 --- a/v3_8_0/CDT-AEContactList-v3_8_0.xsd +++ b/v3_8_0/CDT-AEContactList-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-CSEBase-v3_8_0.xsd b/v3_8_0/CDT-CSEBase-v3_8_0.xsd index 984c348880d14b2c617def814a6d6d30700272a3..579e9971e0a478ef28b46d2490953ad99bbddb19 100644 --- a/v3_8_0/CDT-CSEBase-v3_8_0.xsd +++ b/v3_8_0/CDT-CSEBase-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-accessControlPolicy-v3_8_0.xsd b/v3_8_0/CDT-accessControlPolicy-v3_8_0.xsd index 6d1175adfa91be80fc99d1568a9196159e3daf9b..c474b055d855a31c4495dd0131d462e229262184 100644 --- a/v3_8_0/CDT-accessControlPolicy-v3_8_0.xsd +++ b/v3_8_0/CDT-accessControlPolicy-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-authorizationDecision-v3_8_0.xsd b/v3_8_0/CDT-authorizationDecision-v3_8_0.xsd index 71bde4434ccb0d242ac80cb3fedf00280edd71b3..0c44f8a935575b2b89c2c082a8dcdb9de0c9e8e6 100644 --- a/v3_8_0/CDT-authorizationDecision-v3_8_0.xsd +++ b/v3_8_0/CDT-authorizationDecision-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-authorizationInformation-v3_8_0.xsd b/v3_8_0/CDT-authorizationInformation-v3_8_0.xsd index 40acf97f880d7942b37f2a176406e1c703572a38..4e075e52c20e030017b5cc00c41abe27c57927cd 100644 --- a/v3_8_0/CDT-authorizationInformation-v3_8_0.xsd +++ b/v3_8_0/CDT-authorizationInformation-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-authorizationPolicy-v3_8_0.xsd b/v3_8_0/CDT-authorizationPolicy-v3_8_0.xsd index 9f257f79aebe88e453c0a2ea336f6a75f99d97a4..2c386a0f1343b0ee3035aba309cd265b4d367a55 100644 --- a/v3_8_0/CDT-authorizationPolicy-v3_8_0.xsd +++ b/v3_8_0/CDT-authorizationPolicy-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-backgroundDataTransfer-v3_8_0.xsd b/v3_8_0/CDT-backgroundDataTransfer-v3_8_0.xsd new file mode 100644 index 0000000000000000000000000000000000000000..22d5d4c40c9cc5be0c6d5486d44f4f2bdf956de8 --- /dev/null +++ b/v3_8_0/CDT-backgroundDataTransfer-v3_8_0.xsd @@ -0,0 +1,67 @@ +<?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> diff --git a/v3_8_0/CDT-commonTypes-v3_8_0.xsd b/v3_8_0/CDT-commonTypes-v3_8_0.xsd index 77e13792d3be90e1fc851b1ea75659a4eff36ba5..fb62aed0f3cb325262da8a78111634a48297b2d8 100644 --- a/v3_8_0/CDT-commonTypes-v3_8_0.xsd +++ b/v3_8_0/CDT-commonTypes-v3_8_0.xsd @@ -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> - <!--********************** --> diff --git a/v3_8_0/CDT-container-v3_8_0.xsd b/v3_8_0/CDT-container-v3_8_0.xsd index 1903315942fce9deb17a89cf1ebb87b9dd7621ab..c51b7d2a0d2e719b4b6c843a873e4dd56bf383ae 100644 --- a/v3_8_0/CDT-container-v3_8_0.xsd +++ b/v3_8_0/CDT-container-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-contentInstance-v3_8_0.xsd b/v3_8_0/CDT-contentInstance-v3_8_0.xsd index f1cca43e6e58dcbc958a01fd20ca03cd87845dd3..b08911dbf430a57d8e8cf682150b809a6ac93647 100644 --- a/v3_8_0/CDT-contentInstance-v3_8_0.xsd +++ b/v3_8_0/CDT-contentInstance-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-crossResourceSubscription-v3_8_0.xsd b/v3_8_0/CDT-crossResourceSubscription-v3_8_0.xsd index 652f15d1083da152658204fe77187a1b71fa4694..e7c6f140fee96e63ba96306ebb43de1d0424b683 100644 --- a/v3_8_0/CDT-crossResourceSubscription-v3_8_0.xsd +++ b/v3_8_0/CDT-crossResourceSubscription-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-dynamicAuthorizationConsultation-v3_8_0.xsd b/v3_8_0/CDT-dynamicAuthorizationConsultation-v3_8_0.xsd index 825021c3cf4ec23c3750a416ef4555050787e993..48d86993abe9d168b861ef9a794f9b8cec0db12c 100644 --- a/v3_8_0/CDT-dynamicAuthorizationConsultation-v3_8_0.xsd +++ b/v3_8_0/CDT-dynamicAuthorizationConsultation-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-enumerationTypes-v3_8_0.xsd b/v3_8_0/CDT-enumerationTypes-v3_8_0.xsd index c932f97625a7a47f54bc6810a2b3ba8038de063a..87963201db5b665c5f620c49529ed23a22aba250 100644 --- a/v3_8_0/CDT-enumerationTypes-v3_8_0.xsd +++ b/v3_8_0/CDT-enumerationTypes-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-eventConfig-v3_8_0.xsd b/v3_8_0/CDT-eventConfig-v3_8_0.xsd index 4a65ba27e12f03b5e537023c27f442ee7efd234e..1ef2592cd0a74f4bdfa97dfb627c82f75f9a02e1 100644 --- a/v3_8_0/CDT-eventConfig-v3_8_0.xsd +++ b/v3_8_0/CDT-eventConfig-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-execInstance-v3_8_0.xsd b/v3_8_0/CDT-execInstance-v3_8_0.xsd index e157a6a8dc3443a9eb87ab73b082b94a10451e81..963f97fc08c8ce876d8fd9fbc62c9d6e7686c1ba 100644 --- a/v3_8_0/CDT-execInstance-v3_8_0.xsd +++ b/v3_8_0/CDT-execInstance-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-group-v3_8_0.xsd b/v3_8_0/CDT-group-v3_8_0.xsd index f9c8458fd87586e110d4306314ca7eb688cdc9c7..54d38e7625a56e1971951bedd058c9b0cb6c52f6 100644 --- a/v3_8_0/CDT-group-v3_8_0.xsd +++ b/v3_8_0/CDT-group-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-locationPolicy-v3_8_0.xsd b/v3_8_0/CDT-locationPolicy-v3_8_0.xsd index 1cc0942ef3603e166d189497c3755f6e92570ea4..1f884051ac35374489a6f34d2103266a72558d59 100644 --- a/v3_8_0/CDT-locationPolicy-v3_8_0.xsd +++ b/v3_8_0/CDT-locationPolicy-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd b/v3_8_0/CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd index 93334934cad2e8df315d34515c984046d3165554..e07689c9e217e82736489523b5e6d616a66aef07 100644 --- a/v3_8_0/CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd +++ b/v3_8_0/CDT-m2mServiceSubscriptionProfile-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-mgmtCmd-v3_8_0.xsd b/v3_8_0/CDT-mgmtCmd-v3_8_0.xsd index 3e7146cd2d7ea66582a4c420482adf1a64d2c43d..beecdb76f50881b09e134d317afaccf996fa5e2b 100644 --- a/v3_8_0/CDT-mgmtCmd-v3_8_0.xsd +++ b/v3_8_0/CDT-mgmtCmd-v3_8_0.xsd @@ -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> diff --git a/v3_8_0/CDT-multimediaSession-v3_8_0.xsd b/v3_8_0/CDT-multimediaSession-v3_8_0.xsd index c83eda3875d6d7b0e92f2591640fce35a5f5fc91..ca5a1d57e74cd7722173b8bc294aa4501a2046c1 100644 --- a/v3_8_0/CDT-multimediaSession-v3_8_0.xsd +++ b/v3_8_0/CDT-multimediaSession-v3_8_0.xsd @@ -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" /> </xs:choice> </xs:choice> </xs:sequence> @@ -74,6 +76,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:subscription" /> <xs:element ref="m2m:accessControlPolicy" /> <xs:element ref="m2m:accessControlPolicyAnnc" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/v3_8_0/CDT-node-v3_8_0.xsd b/v3_8_0/CDT-node-v3_8_0.xsd index 3828fc8ae3be0eec6ec483f4814f07421ea9c67c..eb9e7c62063262c4e4866832d18d883784a1acd1 100644 --- a/v3_8_0/CDT-node-v3_8_0.xsd +++ b/v3_8_0/CDT-node-v3_8_0.xsd @@ -42,6 +42,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-activeCmdhPolicy-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="node" substitutionGroup="m2m:sg_announceableResource"> <xs:complexType> @@ -76,6 +77,7 @@ 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:transaction" /> </xs:choice> </xs:choice> </xs:sequence> @@ -116,6 +118,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> diff --git a/v3_8_0/CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd b/v3_8_0/CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd index 1f9febdc0a8bb9eab910be2cb5f1ccb4b5416be1..59cbc9458a57e437275043e0b36407c9019df430 100644 --- a/v3_8_0/CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd +++ b/v3_8_0/CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd @@ -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="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource"> <xs:complexType> @@ -41,8 +42,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> diff --git a/v3_8_0/CDT-notificationTargetPolicy-v3_8_0.xsd b/v3_8_0/CDT-notificationTargetPolicy-v3_8_0.xsd index 60d4e619117ba7d935ac7925951b804c4985b701..a62f9335932eccb590f384dcc54a41d1f183e1fc 100644 --- a/v3_8_0/CDT-notificationTargetPolicy-v3_8_0.xsd +++ b/v3_8_0/CDT-notificationTargetPolicy-v3_8_0.xsd @@ -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-policyDeletionRules-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="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource"> <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:policyDeletionRules" /> <xs:element ref="m2m:subscription" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/v3_8_0/CDT-ontology-v3_8_0.xsd b/v3_8_0/CDT-ontology-v3_8_0.xsd index 93edb9a93dd1c01a5255afd12e44c8fb884d8383..c4bd44819ca0f3f59ac8ec2dfc4bdbce89a2023e 100644 --- a/v3_8_0/CDT-ontology-v3_8_0.xsd +++ b/v3_8_0/CDT-ontology-v3_8_0.xsd @@ -28,6 +28,7 @@ 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="ontology" substitutionGroup="m2m:sg_announceableResource"> @@ -49,7 +50,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <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:subscription" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> @@ -76,6 +78,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> diff --git a/v3_8_0/CDT-ontologyRepository-v3_8_0.xsd b/v3_8_0/CDT-ontologyRepository-v3_8_0.xsd index 7919c4b4ada19cb7d41686be0fbdc03f06c20673..fc08b45307b468d538e0dc45d58ca0f83b5e59de 100644 --- a/v3_8_0/CDT-ontologyRepository-v3_8_0.xsd +++ b/v3_8_0/CDT-ontologyRepository-v3_8_0.xsd @@ -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-ontology-v3_8_0.xsd" /> + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/> <xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource"> @@ -47,7 +48,8 @@ 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:ontology" /> + <xs:element ref="m2m:ontology" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> @@ -72,6 +74,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:subscription" /> <xs:element ref="m2m:ontology" /> <xs:element ref="m2m:ontologyAnnc" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/v3_8_0/CDT-policyDeletionRules-v3_8_0.xsd b/v3_8_0/CDT-policyDeletionRules-v3_8_0.xsd index 0423315bb388af0f2fd21db520d32759e209a8b3..5a949435cafeabdbf40e51536783791a466657b6 100644 --- a/v3_8_0/CDT-policyDeletionRules-v3_8_0.xsd +++ b/v3_8_0/CDT-policyDeletionRules-v3_8_0.xsd @@ -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="policyDeletionRules" substitutionGroup="m2m:sg_regularResource"> <xs:complexType> @@ -41,8 +42,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> diff --git a/v3_8_0/CDT-pollingChannel-v3_8_0.xsd b/v3_8_0/CDT-pollingChannel-v3_8_0.xsd index 50315300d749d712635fdc9b55cef67eb4c9f4ae..f13823e3e0836c76ef62dc9cfe03110e28a1f34f 100644 --- a/v3_8_0/CDT-pollingChannel-v3_8_0.xsd +++ b/v3_8_0/CDT-pollingChannel-v3_8_0.xsd @@ -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="pollingChannel" substitutionGroup="m2m:sg_subordinateResource"> <xs:complexType> @@ -36,7 +37,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <!-- Inherit common attributes --> <xs:extension base="m2m:subordinateResource"> <xs:sequence> - <!-- No Resource Specific Attributes and no child resources --> + <!-- No Resource Specific Attributes --> + + <!-- 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> diff --git a/v3_8_0/CDT-remoteCSE-v3_8_0.xsd b/v3_8_0/CDT-remoteCSE-v3_8_0.xsd index c55fd885fc2008bc131a73b14bc79917543dd81d..66f4cfccb538b5768fa46449ba69fe016832d15a 100644 --- a/v3_8_0/CDT-remoteCSE-v3_8_0.xsd +++ b/v3_8_0/CDT-remoteCSE-v3_8_0.xsd @@ -41,6 +41,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_8_0.xsd" /> <xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" /> <xs:include schemaLocation="CDT-crossResourceSubscription-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="remoteCSE" substitutionGroup="m2m:sg_announceableResource"> <xs:complexType> @@ -93,6 +95,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:semanticMashupInstance" /> <xs:element ref="m2m:semanticMashupInstanceAnnc" /> <xs:element ref="m2m:crossResourceSubscription" /> + <xs:element ref="m2m:transactionMgmt" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> @@ -149,6 +153,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:semanticMashupInstance" /> <xs:element ref="m2m:semanticMashupInstanceAnnc" /> <xs:element ref="m2m:crossResourceSubscription" /> + <xs:element ref="m2m:transactionMgmt" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/v3_8_0/CDT-role-v3_8_0.xsd b/v3_8_0/CDT-role-v3_8_0.xsd index 1812ba849fa226554ecb92697cbb2dd2df54fcda..290c99e9a69998a8eb685a9940bb50a1d4e4ebbb 100644 --- a/v3_8_0/CDT-role-v3_8_0.xsd +++ b/v3_8_0/CDT-role-v3_8_0.xsd @@ -26,7 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <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-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="role" substitutionGroup="m2m:sg_regularResource"> <xs:complexType> @@ -47,6 +49,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> diff --git a/v3_8_0/CDT-schedule-v3_8_0.xsd b/v3_8_0/CDT-schedule-v3_8_0.xsd index b07fb566bf3ddc474598ded3c339933d7a483cef..be888bb7282276681368fe4a166423a6723bad05 100644 --- a/v3_8_0/CDT-schedule-v3_8_0.xsd +++ b/v3_8_0/CDT-schedule-v3_8_0.xsd @@ -43,7 +43,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <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:element ref="m2m:subscription" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> @@ -60,6 +61,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <!-- Resource Specific Attributes --> <xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" /> <xs:element name="networkCoordinated" type="xs:boolean" /> + + <!-- 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> diff --git a/v3_8_0/CDT-semanticDescriptor-v3_8_0.xsd b/v3_8_0/CDT-semanticDescriptor-v3_8_0.xsd index 79df5465f50736e46e04ae79a870edc6d7ece4b2..112e576f00e8ea98e06cb30d81e79ae4d0742da6 100644 --- a/v3_8_0/CDT-semanticDescriptor-v3_8_0.xsd +++ b/v3_8_0/CDT-semanticDescriptor-v3_8_0.xsd @@ -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="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource"> <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> @@ -74,8 +78,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> diff --git a/v3_8_0/CDT-semanticMashupInstance-v3_8_0.xsd b/v3_8_0/CDT-semanticMashupInstance-v3_8_0.xsd index e41d8b2fde282eb49c03dddfb25ed198167f3e9a..6991e92bb7584da47aceb115990a508595a4699a 100644 --- a/v3_8_0/CDT-semanticMashupInstance-v3_8_0.xsd +++ b/v3_8_0/CDT-semanticMashupInstance-v3_8_0.xsd @@ -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-semanticMashupResult-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="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource"> <xs:complexType> @@ -57,6 +58,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:subscription" /> <xs:element ref="m2m:semanticMashupResult" /> <xs:element ref="m2m:semanticDescriptor" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> @@ -90,6 +92,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:semanticMashupResultAnnc" /> <xs:element ref="m2m:semanticDescriptor" /> <xs:element ref="m2m:semanticDescriptorAnnc" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> diff --git a/v3_8_0/CDT-semanticMashupJobProfile-v3_8_0.xsd b/v3_8_0/CDT-semanticMashupJobProfile-v3_8_0.xsd index d94745288d696b7a4eba1457dd8df8dfe3fb5d94..dee50848f8598c70c0654b3055a082f117ce557f 100644 --- a/v3_8_0/CDT-semanticMashupJobProfile-v3_8_0.xsd +++ b/v3_8_0/CDT-semanticMashupJobProfile-v3_8_0.xsd @@ -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-semanticMashupInstance-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="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource"> <xs:complexType> @@ -54,7 +55,8 @@ 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:semanticMashupInstance" /> - <xs:element ref="m2m:semanticDescriptor" /> + <xs:element ref="m2m:semanticDescriptor" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> @@ -86,6 +88,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:semanticMashupInstanceAnnc" /> <xs:element ref="m2m:semanticDescriptor" /> <xs:element ref="m2m:semanticDescriptorAnnc" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/v3_8_0/CDT-semanticMashupResult-v3_8_0.xsd b/v3_8_0/CDT-semanticMashupResult-v3_8_0.xsd index df9896c800912027317c5a26130d5022a9876abc..8743f9aaaf8cfcbd04d3a365448adef631a1c11a 100644 --- a/v3_8_0/CDT-semanticMashupResult-v3_8_0.xsd +++ b/v3_8_0/CDT-semanticMashupResult-v3_8_0.xsd @@ -28,6 +28,7 @@ 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-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="semanticMashupResult" substitutionGroup="m2m:sg_regularResource"> <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:semanticDescriptor" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> @@ -77,6 +79,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> diff --git a/v3_8_0/CDT-serviceSubscribedAppRule-v3_8_0.xsd b/v3_8_0/CDT-serviceSubscribedAppRule-v3_8_0.xsd index 23808a1f43b572a5c7ca231a8ae28f570af024f6..df0b3338013aff4ae33484ba717b88a101228f9d 100644 --- a/v3_8_0/CDT-serviceSubscribedAppRule-v3_8_0.xsd +++ b/v3_8_0/CDT-serviceSubscribedAppRule-v3_8_0.xsd @@ -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="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource"> <xs:complexType> @@ -52,8 +53,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> diff --git a/v3_8_0/CDT-serviceSubscribedNode-v3_8_0.xsd b/v3_8_0/CDT-serviceSubscribedNode-v3_8_0.xsd index 0b95b5ff792bfd626a88f6a10411c937e0ef2d41..dfe829622624a87588b60039e28b8da1262fdd90 100644 --- a/v3_8_0/CDT-serviceSubscribedNode-v3_8_0.xsd +++ b/v3_8_0/CDT-serviceSubscribedNode-v3_8_0.xsd @@ -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="serviceSubscribedNode" 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> diff --git a/v3_8_0/CDT-statsCollect-v3_8_0.xsd b/v3_8_0/CDT-statsCollect-v3_8_0.xsd index fab6a24e686d2b72cc15be841636e42aefa65a04..2bcd9d77f4cf9bcfd3938a8741d8d19ec99d6155 100644 --- a/v3_8_0/CDT-statsCollect-v3_8_0.xsd +++ b/v3_8_0/CDT-statsCollect-v3_8_0.xsd @@ -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="statsCollect" 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> diff --git a/v3_8_0/CDT-statsConfig-v3_8_0.xsd b/v3_8_0/CDT-statsConfig-v3_8_0.xsd index 84e9b0f034cb7e58a647921865c591e28a4bb695..7432f11115e0c2da58ba38a315caa643d1490192 100644 --- a/v3_8_0/CDT-statsConfig-v3_8_0.xsd +++ b/v3_8_0/CDT-statsConfig-v3_8_0.xsd @@ -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-eventConfig-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="statsConfig" substitutionGroup="m2m:sg_regularResource"> <xs:complexType> @@ -46,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:eventConfig" /> <xs:element ref="m2m:subscription" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/v3_8_0/CDT-subscription-v3_8_0.xsd b/v3_8_0/CDT-subscription-v3_8_0.xsd index 7f2422cc02482379c397d1cfe0eb2c89cc9ff110..f743ea1ed25f0a0332024f202cf96effdabaad4c 100644 --- a/v3_8_0/CDT-subscription-v3_8_0.xsd +++ b/v3_8_0/CDT-subscription-v3_8_0.xsd @@ -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="subscription" substitutionGroup="m2m:sg_regularResource"> <xs:complexType> @@ -62,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:schedule" /> <xs:element ref="m2m:notificationTargetMgmtPolicyRef" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/v3_8_0/CDT-timeSeries-v3_8_0.xsd b/v3_8_0/CDT-timeSeries-v3_8_0.xsd index 3facab68c188edf43392f49d031c7fa40dcbbf2d..b3b28646db61bd2a91e41e8d3564224cac4dde5e 100644 --- a/v3_8_0/CDT-timeSeries-v3_8_0.xsd +++ b/v3_8_0/CDT-timeSeries-v3_8_0.xsd @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-timeSeriesInstance-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="timeSeries" 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:timeSeriesInstance" /> <xs:element ref="m2m:subscription" /> <xs:element ref="m2m:semanticDescriptor" /> + <xs:element ref="m2m:transaction" /> </xs:choice> </xs:choice> </xs:sequence> @@ -82,8 +84,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <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="periodicInterval" type="xs:nonNegativeInteger" 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" /> @@ -99,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> diff --git a/v3_8_0/CDT-timeSeriesInstance-v3_8_0.xsd b/v3_8_0/CDT-timeSeriesInstance-v3_8_0.xsd index 8572ecf1fcef5e5daff233032d18b2ebdf440ee7..9eba039555c8eb95ee09eb397a4233d011c1fca4 100644 --- a/v3_8_0/CDT-timeSeriesInstance-v3_8_0.xsd +++ b/v3_8_0/CDT-timeSeriesInstance-v3_8_0.xsd @@ -27,6 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <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-v3_8_0.xsd" /> + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/> <xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource"> <xs:complexType> @@ -40,7 +41,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="contentSize" type="xs:nonNegativeInteger" /> <!-- 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> @@ -58,7 +64,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="contentSize" type="xs:nonNegativeInteger" 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:transaction" /> + </xs:choice> + </xs:choice> </xs:sequence> </xs:extension> </xs:complexContent> diff --git a/v3_8_0/CDT-token-v3_8_0.xsd b/v3_8_0/CDT-token-v3_8_0.xsd index 67440f156ee35af6e7dc987147d769724d98d8d9..6ae082c14bafc42fc20c12953c282677e1232706 100644 --- a/v3_8_0/CDT-token-v3_8_0.xsd +++ b/v3_8_0/CDT-token-v3_8_0.xsd @@ -26,7 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <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-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="token" substitutionGroup="m2m:sg_regularResource"> <xs:complexType> @@ -51,6 +55,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> diff --git a/v3_8_0/CDT-transaction-v3_8_0.xsd b/v3_8_0/CDT-transaction-v3_8_0.xsd new file mode 100644 index 0000000000000000000000000000000000000000..862335e98adb5a9f8c770d6099fbf27eb52a7ae0 --- /dev/null +++ b/v3_8_0/CDT-transaction-v3_8_0.xsd @@ -0,0 +1,66 @@ +<?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:include schemaLocation="CDT-responsePrimitive-v3_8_0.xsd" /> + + <xs:element name="transaction" 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="transactionID" type="xs:string" /> + <xs:element name="transactionControl" type="m2m:transactionControl" /> + <xs:element name="transactionState" type="m2m:transactionState" /> + <xs:element name="transactionLockTime" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="transactionExecuteTime" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="transactionCommitTime" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="transactionLockType" type="m2m:transactionLockType" minOccurs="0" /> + <xs:element ref="m2m:requestPrimitive" /> + <xs:element ref="m2m:responsePrimitive" /> + + <!-- 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> diff --git a/v3_8_0/CDT-transactionMgmt-v3_8_0.xsd b/v3_8_0/CDT-transactionMgmt-v3_8_0.xsd new file mode 100644 index 0000000000000000000000000000000000000000..e68291861f2eae14d84aeeb195c695e9d4cb5aa8 --- /dev/null +++ b/v3_8_0/CDT-transactionMgmt-v3_8_0.xsd @@ -0,0 +1,69 @@ +<?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:include schemaLocation="CDT-responsePrimitive-v3_8_0.xsd" /> + + <xs:element name="transactionMgmt" 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="transactionLockTime" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="transactionExecuteTime" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="transactionCommitTime" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="transactionExpirationTime" type="m2m:timestamp" minOccurs="0" /> + <xs:element name="transactionMode" type="m2m:transactionMode" minOccurs="0" /> + <xs:element name="transactionLockType" type="m2m:transactionLockType" minOccurs="0" /> + <xs:element name="transactionControl" type="m2m:transactionControl" minOccurs="0" /> + <xs:element name="transactionState" type="m2m:transactionState" /> + <xs:element name="transactionMaxRetries" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="transactionMgmtHandling" type="m2m:transactionMgmtHandling" minOccurs="0" /> + <xs:element name="requestPrimitives" type="m2m:aggregatedRequest" /> + <xs:element name="responsePrimitives" type="m2m:aggregatedResponse" /> + + <!-- 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> diff --git a/v3_8_0/CDT-triggerRequest-v3_8_0.xsd b/v3_8_0/CDT-triggerRequest-v3_8_0.xsd index ba0c0c314239bf1e18fd7a699d0fda061c807a36..336cc926e2be3192d47e28586e9feceb868e0662 100644 --- a/v3_8_0/CDT-triggerRequest-v3_8_0.xsd +++ b/v3_8_0/CDT-triggerRequest-v3_8_0.xsd @@ -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="triggerRequest" 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: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>