Commit 45c0f8f454cc681ef270bc2467ae74584a7b6958

Authored by Wolfgang Granzow
1 parent 76063b59

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

See PRO-2018-0197 for the detailed list of changes.
Showing 46 changed files with 543 additions and 59 deletions
... ... @@ -39,6 +39,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
39 39 <xs:include schemaLocation="CDT-multimediaSession-v3_8_0.xsd" />
40 40 <xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
41 41 <xs:include schemaLocation="CDT-triggerRequest-v3_8_0.xsd" />
  42 + <xs:include schemaLocation="CDT-transactionMgmt-v3_8_0.xsd" />
  43 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd" />
42 44  
43 45 <xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
44 46 <xs:complexType>
... ... @@ -81,6 +83,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
81 83 <xs:element ref="m2m:multimediaSession" />
82 84 <xs:element ref="m2m:crossResourceSubscription" />
83 85 <xs:element ref="m2m:triggerRequest" />
  86 + <xs:element ref="m2m:transactionMgmt" />
  87 + <xs:element ref="m2m:transaction" />
84 88 </xs:choice>
85 89 </xs:choice>
86 90 </xs:sequence>
... ... @@ -135,6 +139,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
135 139 <xs:element ref="m2m:multimediaSessionAnnc" />
136 140 <xs:element ref="m2m:crossResourceSubscription" />
137 141 <xs:element ref="m2m:triggerRequest" />
  142 + <xs:element ref="m2m:transactionMgmt" />
  143 + <xs:element ref="m2m:transaction" />
138 144 </xs:choice>
139 145 </xs:choice>
140 146 </xs:sequence>
... ...
... ... @@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 30 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
32 32 <xs:include schemaLocation="CDT-AEContactListPerCSE-v3_8_0.xsd" />
33   -
  33 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
34 34  
35 35 <xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
36 36 <xs:complexType>
... ... @@ -47,6 +47,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
47 47 <xs:choice minOccurs="1" maxOccurs="unbounded">
48 48 <xs:element ref="m2m:subscription" />
49 49 <xs:element ref="m2m:AEContactListPerCSE" />
  50 + <xs:element ref="m2m:transaction" />
50 51 </xs:choice>
51 52 </xs:choice>
52 53 </xs:sequence>
... ...
... ... @@ -55,6 +55,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
55 55 <xs:include schemaLocation="CDT-AEContactList-v3_8_0.xsd" />
56 56 <xs:include schemaLocation="CDT-localMulticastGroup-v3_8_0.xsd" />
57 57 <xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
  58 + <xs:include schemaLocation="CDT-backgroundDataTransfer-v3_8_0.xsd" />
  59 + <xs:include schemaLocation="CDT-transactionMgmt-v3_8_0.xsd" />
  60 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd" />
58 61  
59 62 <xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
60 63 <xs:complexType>
... ... @@ -111,6 +114,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
111 114 <xs:element ref="m2m:AEContactList" />
112 115 <xs:element ref="m2m:localMulticastGroup" />
113 116 <xs:element ref="m2m:crossResourceSubscription" />
  117 + <xs:element ref="m2m:backgroundDataTransfer" />
  118 + <xs:element ref="m2m:transactionMgmt" />
  119 + <xs:element ref="m2m:transaction" />
114 120 </xs:choice>
115 121 </xs:choice>
116 122 </xs:sequence>
... ...
... ... @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29  
30 30 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd"/>
31 31 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd"/>
  32 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
32 33  
33 34 <xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
34 35 <xs:complexType>
... ... @@ -42,9 +43,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
42 43  
43 44 <!-- Child Resources -->
44 45 <xs:choice minOccurs="0" maxOccurs="1">
45   - <xs:element name="childResource" type="m2m:childResourceRef"
46   - maxOccurs="unbounded"/>
47   - <xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
  46 + <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
  47 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  48 + <xs:element ref="m2m:subscription" />
  49 + <xs:element ref="m2m:transaction" />
  50 + </xs:choice>
48 51 </xs:choice>
49 52 </xs:sequence>
50 53 </xs:extension>
... ... @@ -64,11 +67,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
64 67  
65 68 <!-- Child Resources -->
66 69 <xs:choice minOccurs="0" maxOccurs="1">
67   - <xs:element name="childResource" type="m2m:childResourceRef"
68   - maxOccurs="unbounded"/>
69   - <xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
  70 + <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
  71 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  72 + <xs:element ref="m2m:subscription" />
  73 + <xs:element ref="m2m:transaction" />
  74 + </xs:choice>
70 75 </xs:choice>
71 76 </xs:sequence>
  77 +
72 78 </xs:extension>
73 79 </xs:complexContent>
74 80 </xs:complexType>
... ...
... ... @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
28 28  
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
31 32  
32 33 <xs:element name="authorizationDecision" substitutionGroup="m2m:sg_regularResource">
33 34 <xs:complexType>
... ... @@ -79,9 +80,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
79 80  
80 81 <!-- Child Resources -->
81 82 <xs:choice minOccurs="0" maxOccurs="1">
82   - <xs:element name="childResource" type="m2m:childResourceRef"
83   - maxOccurs="unbounded"/>
84   - <xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
  83 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  84 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  85 + <xs:element ref="m2m:subscription" />
  86 + <xs:element ref="m2m:transaction" />
  87 + </xs:choice>
85 88 </xs:choice>
86 89 </xs:sequence>
87 90 </xs:extension>
... ...
... ... @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-role-v3_8_0.xsd" />
32 32 <xs:include schemaLocation="CDT-token-v3_8_0.xsd" />
  33 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
33 34  
34 35 <xs:element name="authorizationInformation" substitutionGroup="m2m:sg_regularResource">
35 36 <xs:complexType>
... ... @@ -68,6 +69,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
68 69 <xs:element ref="m2m:role" />
69 70 <xs:element ref="m2m:token" />
70 71 <xs:element ref="m2m:subscription" />
  72 + <xs:element ref="m2m:transaction" />
71 73 </xs:choice>
72 74 </xs:choice>
73 75 </xs:sequence>
... ...
... ... @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
28 28  
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
31 32  
32 33 <xs:element name="authorizationPolicy" substitutionGroup="m2m:sg_regularResource">
33 34 <xs:complexType>
... ... @@ -43,9 +44,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
43 44  
44 45 <!-- Child Resources -->
45 46 <xs:choice minOccurs="0" maxOccurs="1">
46   - <xs:element name="childResource" type="m2m:childResourceRef"
47   - maxOccurs="unbounded"/>
48   - <xs:element ref="m2m:subscription" maxOccurs="unbounded"/>
  47 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  48 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  49 + <xs:element ref="m2m:subscription" />
  50 + <xs:element ref="m2m:transaction" />
  51 + </xs:choice>
49 52 </xs:choice>
50 53 </xs:sequence>
51 54 </xs:extension>
... ...
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!--
  3 +Copyright Notification
  4 +
  5 +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
  6 +contained in the original materials on any copies of the materials and that you comply strictly with these terms.
  7 +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
  8 +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
  9 +© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
  10 +
  11 +
  12 +Notice of Disclaimer & Limitation of Liability
  13 +
  14 +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
  15 +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
  16 +No recommendation as to products or vendors is made or should be implied.
  17 +
  18 +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
  19 +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
  20 +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
  21 +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
  22 +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
  23 +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
  24 +
  25 +-->
  26 +
  27 +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
  28 + xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  29 +
  30 + <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  32 +
  33 + <xs:element name="backgroundDataTransfer" substitutionGroup="m2m:sg_regularResource">
  34 + <xs:complexType>
  35 + <xs:complexContent>
  36 + <!-- Inherit common attributes from RegularResource Type -->
  37 + <xs:extension base="m2m:regularResource">
  38 + <xs:sequence>
  39 + <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
  40 + <xs:element name="creator" type="m2m:ID" minOccurs="0" />
  41 + <!-- Resource Specific Attributes -->
  42 + <xs:element name="volumePerNode" type="xs:positiveInteger" />
  43 + <xs:element name="numberOfNodes" type="xs:positiveInteger" />
  44 + <xs:element name="desiredTimeWindow" type="m2m:scheduleEntry" minOccurs="0" />
  45 + <xs:element name="transferSelectionGuidance" type="m2m:transferSelectionGuidance" minOccurs="0" />
  46 + <xs:element name="geographicInformation" type="m2m:locationRegion" minOccurs="0" />
  47 + <xs:element name="groupLink" type="xs:anyURI" minOccurs="0" />
  48 + <xs:element name="memberIDs" minOccurs="0" >
  49 + <xs:simpleType>
  50 + <xs:list itemType="xs:anyURI"/>
  51 + </xs:simpleType>
  52 + </xs:element>
  53 +
  54 + <!-- Child Resources -->
  55 + <xs:choice minOccurs="0" maxOccurs="1">
  56 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  57 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  58 + <xs:element ref="m2m:subscription" />
  59 + </xs:choice>
  60 + </xs:choice>
  61 + </xs:sequence>
  62 + </xs:extension>
  63 + </xs:complexContent>
  64 + </xs:complexType>
  65 + </xs:element>
  66 +
  67 +</xs:schema>
... ...
... ... @@ -359,9 +359,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
359 359  
360 360 <xs:simpleType name="scheduleEntry">
361 361 <xs:restriction base="xs:string">
362   - <xs:pattern
363   - 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])?)*))" />
364   - </xs:restriction>
  362 + <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>
365 363 </xs:simpleType>
366 364  
367 365 <xs:simpleType name="listOfURIs">
... ... @@ -511,9 +509,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
511 509 </xs:simpleType>
512 510  
513 511 <xs:simpleType name="resourceList" >
514   - <xs:list itemType="xs:anyURI" />
  512 + <xs:list itemType="xs:anyURI" />
515 513 </xs:simpleType>
516   -
517 514  
518 515  
519 516 <!--********************** -->
... ...
... ... @@ -31,6 +31,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
31 31 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
32 32 <xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
33 33 <xs:include schemaLocation="CDT-timeSeries-v3_8_0.xsd" />
  34 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
34 35  
35 36  
36 37 <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
61 62 <xs:element ref="m2m:semanticDescriptor" />
62 63 <xs:element ref="m2m:sg_flexContainerResource" />
63 64 <xs:element ref="m2m:timeSeries" />
  65 + <xs:element ref="m2m:transaction" />
64 66 </xs:choice>
65 67 </xs:choice>
66 68 </xs:sequence>
... ... @@ -101,6 +103,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
101 103 <xs:element ref="m2m:sg_announcedFlexContainerResource" />
102 104 <xs:element ref="m2m:timeSeries" />
103 105 <xs:element ref="m2m:timeSeriesAnnc" />
  106 + <xs:element ref="m2m:transaction" />
104 107 </xs:choice>
105 108 </xs:choice>
106 109 </xs:sequence>
... ...
... ... @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29  
30 30 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
  32 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
32 33  
33 34 <xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
34 35 <xs:complexType>
... ... @@ -47,8 +48,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
47 48  
48 49 <!-- Child Resources -->
49 50 <xs:choice minOccurs="0" maxOccurs="1">
50   - <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
51   - <xs:element ref="m2m:semanticDescriptor" maxOccurs="unbounded" />
  51 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  52 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  53 + <xs:element ref="m2m:semanticDescriptor" />
  54 + <xs:element ref="m2m:transaction" />
  55 + </xs:choice>
52 56 </xs:choice>
53 57 </xs:sequence>
54 58 </xs:extension>
... ... @@ -71,8 +75,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
71 75  
72 76 <!-- Child Resources -->
73 77 <xs:choice minOccurs="0" maxOccurs="1">
74   - <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
75   - <xs:element ref="m2m:semanticDescriptor" maxOccurs="unbounded" />
  78 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  79 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  80 + <xs:element ref="m2m:semanticDescriptor" />
  81 + <xs:element ref="m2m:transaction" />
  82 + </xs:choice>
76 83 </xs:choice>
77 84 </xs:sequence>
78 85 </xs:extension>
... ...
... ... @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 30 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
32 32 <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd" />
  33 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
33 34  
34 35 <xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
35 36 <xs:complexType>
... ... @@ -40,8 +41,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
40 41 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
41 42 <xs:element name="creator" type="m2m:ID" />
42 43 <!-- Resource Specific Attributes -->
43   - <xs:element name="regularResourcesAsTarget" type="m2m:resourceList" minOccurs="0" />
44   - <xs:element name="subscriptionResourcesAsTarget" type="m2m:resourceList" minOccurs="0" />
  44 + <xs:element name="regularResourcesAsTarget" type="m2m:listOfURIs" minOccurs="0" />
  45 + <xs:element name="subscriptionResourcesAsTarget" type="m2m:listOfURIs" minOccurs="0" />
45 46 <xs:element name="timeWindowType" type="m2m:timeWindowType" />
46 47 <xs:element name="timeWindowSize" type="m2m:absRelTimestamp" />
47 48 <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
60 61 <xs:choice minOccurs="1" maxOccurs="unbounded">
61 62 <xs:element ref="m2m:schedule" />
62 63 <xs:element ref="m2m:notificationTargetMgmtPolicyRef" />
  64 + <xs:element ref="m2m:transaction" />
63 65 </xs:choice>
64 66 </xs:choice>
65 67 </xs:sequence>
... ...
... ... @@ -27,6 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
27 27 elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
28 28  
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
  30 + <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
30 32  
31 33 <xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
32 34 <xs:complexType>
... ... @@ -39,7 +41,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
39 41 <xs:element name="dynamicAuthorizationPoA" type="m2m:listOfURIs" />
40 42 <xs:element name="dynamicAuthorizationLifetime" type="m2m:timestamp" minOccurs="0" />
41 43  
42   - <!-- This Resource Type has no Child Resources -->
  44 + <!-- Child Resources -->
  45 + <xs:choice minOccurs="0" maxOccurs="1">
  46 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  47 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  48 + <xs:element ref="m2m:subscription" />
  49 + <xs:element ref="m2m:transaction" />
  50 + </xs:choice>
  51 + </xs:choice>
43 52 </xs:sequence>
44 53 </xs:extension>
45 54 </xs:complexContent>
... ...
... ... @@ -126,7 +126,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
126 126 <!-- triggerRequest -->
127 127 <xs:enumeration value="47" />
128 128 <!-- crossResourceSubscription -->
129   - <xs:enumeration value="48" />
  129 + <xs:enumeration value="48" />
  130 + <!-- backgroundDataTransfer -->
  131 + <xs:enumeration value="49" />
  132 + <!-- transactionMgmt -->
  133 + <xs:enumeration value="50" />
  134 + <!-- transaction -->
  135 + <xs:enumeration value="51" />
130 136 <!-- accessControlPolicyAnnc -->
131 137 <xs:enumeration value="10001" />
132 138 <!-- AEAnnc -->
... ... @@ -247,6 +253,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
247 253 <xs:enumeration value="3" />
248 254 <!-- flexBlocking -->
249 255 <xs:enumeration value="4" />
  256 + <!-- noResponse -->
  257 + <xs:enumeration value="5" />
250 258 </xs:restriction>
251 259 </xs:simpleType>
252 260  
... ... @@ -320,7 +328,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
320 328 <!-- OPERATION_NOT_ALLOWED -->
321 329 <xs:enumeration value="4005" />
322 330 <!-- REQUEST_TIMEOUT -->
323   - <xs:enumeration value="4008" />
  331 + <xs:enumeration value="4008" />
  332 + <!-- UNSUPPORTED_MEDIA_TYPE -->
  333 + <xs:enumeration value="4015" />
324 334 <!-- SUBSCRIPTION_CREATOR_HAS_NO_PRIVILEGE -->
325 335 <xs:enumeration value="4101" />
326 336 <!-- CONTENTS_UNACCEPTABLE -->
... ... @@ -337,6 +347,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
337 347 <xs:enumeration value="4107" />
338 348 <!-- INVALID_CHILD_RESOURCE_TYPE -->
339 349 <xs:enumeration value="4108" />
  350 + <!-- UNSUPPORTED_MEDIA_TYPE -->
  351 + <xs:enumeration value="4015" />
340 352 <!-- NO_MEMBERS -->
341 353 <xs:enumeration value="4109" />
342 354 <!-- GROUP_MEMBER_TYPE_INCONSISTENT -->
... ... @@ -365,6 +377,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
365 377 <xs:enumeration value="4121" />
366 378 <!-- INVALID_TRIGGER_PURPOSE -->
367 379 <xs:enumeration value="4122" />
  380 + <!-- ILLEGAL_TRANSACTION_STATE_TRANSITION_ATTEMPTED -->
  381 + <xs:enumeration value="4123" />
368 382 <!-- INTERNAL_SERVER_ERROR -->
369 383 <xs:enumeration value="5000" />
370 384 <!-- NOT_IMPLEMENTED -->
... ... @@ -381,7 +395,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
381 395 <xs:enumeration value="5204" />
382 396 <!-- SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE -->
383 397 <xs:enumeration value="5205" />
384   - <!-- NON_BLOCKING_REQUEST_NOT_SUPPORTED -->
  398 + <!-- NON_BLOCKING_SYNCH_REQUEST_NOT_SUPPORTED -->
385 399 <xs:enumeration value="5206" />
386 400 <!-- NOT_ACCEPTABLE -->
387 401 <xs:enumeration value="5207" />
... ... @@ -411,7 +425,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
411 425 <!-- UNABLE_TO_RECALL_TRIGGER_REQUEST -->
412 426 <xs:enumeration value="5220" />
413 427 <!-- CROSS_RESOURCE_OPERATION_FAILURE -->
414   - <xs:enumeration value="5221" />
  428 + <xs:enumeration value="5221" />
  429 + <!-- TRANSACTION_PROCESSING_IS_INCOMPLETE -->
  430 + <xs:enumeration value="5222" />
415 431 <!-- SPARQL_UPDATE_ERROR -->
416 432 <xs:enumeration value="6003" />
417 433 <!-- EXTERNAL_OBJECT_NOT_FOUND -->
... ... @@ -456,6 +472,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
456 472 <xs:enumeration value="3" />
457 473 <!-- FORWARDED -->
458 474 <xs:enumeration value="4" />
  475 + <!-- PARTIALLY_COMPLETED -->
  476 + <xs:enumeration value="5" />
459 477 </xs:restriction>
460 478 </xs:simpleType>
461 479  
... ... @@ -559,6 +577,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
559 577 <xs:enumeration value="47" />
560 578 <!-- crossResourceSubscription -->
561 579 <xs:enumeration value="48" />
  580 + <!-- backgroundDataTransfer -->
  581 + <xs:enumeration value="49" />
  582 + <!-- transactionMgmt -->
  583 + <xs:enumeration value="50" />
  584 + <!-- transaction -->
  585 + <xs:enumeration value="51" />
562 586 <!-- accessControlPolicyAnnc -->
563 587 <xs:enumeration value="10001" />
564 588 <!-- AEAnnc -->
... ... @@ -1515,6 +1539,91 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
1515 1539 <xs:enumeration value="2" />
1516 1540 </xs:restriction>
1517 1541 </xs:simpleType>
1518   -
  1542 +
  1543 + <xs:simpleType name="transferSelectionGuidance">
  1544 + <xs:annotation>
  1545 + <xs:documentation>Used for transferSelectionGuidance attribute in backgroundDataTransfer resource</xs:documentation>
  1546 + </xs:annotation>
  1547 + <xs:restriction base="xs:integer">
  1548 + <!-- lowestCost -->
  1549 + <xs:enumeration value="1" />
  1550 + <!-- bestDataRates -->
  1551 + <xs:enumeration value="2" />
  1552 + </xs:restriction>
  1553 + </xs:simpleType>
  1554 +
  1555 + <xs:simpleType name="transactionMode">
  1556 + <xs:annotation>
  1557 + <xs:documentation>Used for the transactionMode attribute in transactionMgmt resource</xs:documentation>
  1558 + </xs:annotation>
  1559 + <xs:restriction base="xs:integer">
  1560 + <!-- CSE_CONTROLLED -->
  1561 + <xs:enumeration value="1" />
  1562 + <!-- CREATOR_CONTROLLED -->
  1563 + <xs:enumeration value="2" />
  1564 + </xs:restriction>
  1565 + </xs:simpleType>
  1566 + <xs:simpleType name="transactionControl">
  1567 + <xs:annotation>
  1568 + <xs:documentation>Used for the transactionState attribute in transactionMgmt and transaction resource to monitor the state of a transaction.</xs:documentation>
  1569 + </xs:annotation>
  1570 + <xs:restriction base="xs:integer">
  1571 + <!-- INITIAL -->
  1572 + <xs:enumeration value="1" />
  1573 + <!-- LOCK -->
  1574 + <xs:enumeration value="2" />
  1575 + <!-- EXECUTE -->
  1576 + <xs:enumeration value="3" />
  1577 + <!-- COMMIT -->
  1578 + <xs:enumeration value="4" />
  1579 + <!-- ABORT -->
  1580 + <xs:enumeration value="5" />
  1581 + </xs:restriction>
  1582 + </xs:simpleType>
  1583 +
  1584 + <xs:simpleType name="transactionState">
  1585 + <xs:annotation>
  1586 + <xs:documentation>Used for the transactionState attribute in transactionMgmt and transaction resource to monitor the state of a transaction.</xs:documentation>
  1587 + </xs:annotation>
  1588 + <xs:restriction base="xs:integer">
  1589 + <!-- INITIAL -->
  1590 + <xs:enumeration value="1" />
  1591 + <!-- LOCKED -->
  1592 + <xs:enumeration value="2" />
  1593 + <!-- EXECUTED -->
  1594 + <xs:enumeration value="3" />
  1595 + <!-- COMMITTED -->
  1596 + <xs:enumeration value="4" />
  1597 + <!-- ERROR -->
  1598 + <xs:enumeration value="5" />
  1599 + <!-- ABORTED -->
  1600 + <xs:enumeration value="6" />
  1601 + </xs:restriction>
  1602 + </xs:simpleType>
  1603 +
  1604 + <xs:simpleType name="transactionLockType">
  1605 + <xs:annotation>
  1606 + <xs:documentation>Used for the transactionMode attribute in transactionMgmt resource</xs:documentation>
  1607 + </xs:annotation>
  1608 + <xs:restriction base="xs:integer">
  1609 + <!-- BLOCK_ALL -->
  1610 + <xs:enumeration value="1" />
  1611 + <!-- ALLOW_RETRIEVES -->
  1612 + <xs:enumeration value="2" />
  1613 + </xs:restriction>
  1614 + </xs:simpleType>
  1615 +
  1616 + <xs:simpleType name="transactionMgmtHandling">
  1617 + <xs:annotation>
  1618 + <xs:documentation>Used for the transactionMode attribute in transactionMgmt resource</xs:documentation>
  1619 + </xs:annotation>
  1620 + <xs:restriction base="xs:integer">
  1621 + <!-- DELETE -->
  1622 + <xs:enumeration value="1" />
  1623 + <!-- PERSIST -->
  1624 + <xs:enumeration value="2" />
  1625 + </xs:restriction>
  1626 + </xs:simpleType>
  1627 +
1519 1628 </xs:schema>
1520 1629  
... ...
... ... @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
28 28  
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
31 32  
32 33 <xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
33 34 <xs:complexType>
... ... @@ -51,8 +52,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
51 52  
52 53 <!-- Child Resources -->
53 54 <xs:choice minOccurs="0" maxOccurs="1">
54   - <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
55   - <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
  55 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  56 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  57 + <xs:element ref="m2m:subscription" />
  58 + <xs:element ref="m2m:transaction" />
  59 + </xs:choice>
56 60 </xs:choice>
57 61 </xs:sequence>
58 62 </xs:extension>
... ...
... ... @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
28 28  
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
31 32  
32 33 <xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
33 34 <xs:complexType>
... ... @@ -48,8 +49,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
48 49  
49 50 <!-- Child Resources -->
50 51 <xs:choice minOccurs="0" maxOccurs="1">
51   - <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
52   - <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
  52 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  53 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  54 + <xs:element ref="m2m:subscription" />
  55 + <xs:element ref="m2m:transaction" />
  56 + </xs:choice>
53 57 </xs:choice>
54 58 </xs:sequence>
55 59 </xs:extension>
... ...
... ... @@ -30,6 +30,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 30 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
32 32 <xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
  33 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
  34 +
33 35  
34 36 <xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
35 37 <xs:complexType>
... ... @@ -53,6 +55,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
53 55 <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
54 56 <xs:element name="groupName" type="xs:string" minOccurs="0" />
55 57 <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0" />
  58 + <xs:element name="notifyAggregation" type="m2m:batchNotify" minOccurs="0"/>
56 59  
57 60 <!-- Child Resources -->
58 61 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -60,6 +63,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
60 63 <xs:choice minOccurs="1" maxOccurs="unbounded">
61 64 <xs:element ref="m2m:subscription" />
62 65 <xs:element ref="m2m:semanticDescriptor" />
  66 + <xs:element ref="m2m:transaction" />
63 67 </xs:choice>
64 68 </xs:choice>
65 69 </xs:sequence>
... ... @@ -88,6 +92,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
88 92 <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
89 93 <xs:element name="groupName" type="xs:string" minOccurs="0" />
90 94 <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0" />
  95 + <xs:element name="notifyAggregation" type="m2m:batchNotify" minOccurs="0"/>
91 96  
92 97 <!-- Child Resources -->
93 98 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -96,6 +101,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
96 101 <xs:element ref="m2m:subscription" />
97 102 <xs:element ref="m2m:semanticDescriptor" />
98 103 <xs:element ref="m2m:semanticDescriptorAnnc" />
  104 + <xs:element ref="m2m:transaction" />
99 105 </xs:choice>
100 106 </xs:choice>
101 107 </xs:sequence>
... ...
... ... @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29  
30 30 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  32 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
32 33  
33 34 <xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
34 35 <xs:complexType>
... ... @@ -41,7 +42,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
41 42 <xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
42 43 <xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
43 44 <xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
44   - <xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
  45 + <xs:element name="locationContainerID" type="xs:anyURI" />
45 46 <xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
46 47 <xs:element name="locationStatus" type="xs:string" />
47 48 <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
53 54 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
54 55 <xs:choice minOccurs="1" maxOccurs="unbounded">
55 56 <xs:element ref="m2m:subscription" />
  57 + <xs:element ref="m2m:transaction" />
56 58 </xs:choice>
57 59 </xs:choice>
58 60 </xs:sequence>
... ... @@ -79,7 +81,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
79 81 <xs:element name="retrieveLastKnownLocation" type="xs:boolean" minOccurs="0" />
80 82 <xs:element name="locationUpdateEventCriteria" type="m2m:locationUpdateEventCriteria" minOccurs="0" />
81 83  
82   - <!-- No Child Resources -->
  84 + <!-- Child Resources -->
  85 + <xs:choice minOccurs="0" maxOccurs="1">
  86 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  87 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  88 + <xs:element ref="m2m:transaction" />
  89 + </xs:choice>
  90 + </xs:choice>
83 91 </xs:sequence>
84 92 </xs:extension>
85 93 </xs:complexContent>
... ...
... ... @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-serviceSubscribedNode-v3_8_0.xsd" />
  32 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
32 33  
33 34 <xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
34 35 <xs:complexType>
... ... @@ -44,6 +45,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
44 45 <xs:choice minOccurs="1" maxOccurs="unbounded">
45 46 <xs:element ref="m2m:serviceSubscribedNode" />
46 47 <xs:element ref="m2m:subscription" />
  48 + <xs:element ref="m2m:transaction" />
47 49 </xs:choice>
48 50 </xs:choice>
49 51 </xs:sequence>
... ...
... ... @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-execInstance-v3_8_0.xsd" />
  32 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
32 33  
33 34 <xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
34 35 <xs:complexType>
... ... @@ -53,6 +54,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
53 54 <xs:choice minOccurs="1" maxOccurs="unbounded">
54 55 <xs:element ref="m2m:execInstance" />
55 56 <xs:element ref="m2m:subscription" />
  57 + <xs:element ref="m2m:transaction" />
56 58 </xs:choice>
57 59 </xs:choice>
58 60 </xs:sequence>
... ...
... ... @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 30 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
32 32 <xs:include schemaLocation="CDT-accessControlPolicy-v3_8_0.xsd" />
  33 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
33 34  
34 35 <xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
35 36 <xs:complexType>
... ... @@ -49,6 +50,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
49 50 <xs:choice minOccurs="1" maxOccurs="unbounded">
50 51 <xs:element ref="m2m:subscription" />
51 52 <xs:element ref="m2m:accessControlPolicy" />
  53 + <xs:element ref="m2m:transaction" />
52 54 </xs:choice>
53 55 </xs:choice>
54 56 </xs:sequence>
... ... @@ -74,6 +76,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
74 76 <xs:element ref="m2m:subscription" />
75 77 <xs:element ref="m2m:accessControlPolicy" />
76 78 <xs:element ref="m2m:accessControlPolicyAnnc" />
  79 + <xs:element ref="m2m:transaction" />
77 80 </xs:choice>
78 81 </xs:choice>
79 82 </xs:sequence>
... ...
... ... @@ -42,6 +42,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
42 42 <xs:include schemaLocation="CDT-activeCmdhPolicy-v3_8_0.xsd" />
43 43 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
44 44 <xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
  45 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
45 46  
46 47 <xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
47 48 <xs:complexType>
... ... @@ -76,6 +77,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
76 77 <xs:element ref="m2m:activeCmdhPolicy" />
77 78 <xs:element ref="m2m:subscription" />
78 79 <xs:element ref="m2m:semanticDescriptor" />
  80 + <xs:element ref="m2m:transaction" />
79 81 </xs:choice>
80 82 </xs:choice>
81 83 </xs:sequence>
... ... @@ -116,6 +118,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
116 118 <xs:element ref="m2m:subscription" />
117 119 <xs:element ref="m2m:semanticDescriptor" />
118 120 <xs:element ref="m2m:semanticDescriptorAnnc" />
  121 + <xs:element ref="m2m:transaction" />
119 122 </xs:choice>
120 123 </xs:choice>
121 124 </xs:sequence>
... ...
... ... @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
28 28  
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
31 32  
32 33 <xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
33 34 <xs:complexType>
... ... @@ -41,8 +42,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
41 42  
42 43 <!-- Child Resources -->
43 44 <xs:choice minOccurs="0" maxOccurs="1">
44   - <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
45   - <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
  45 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  46 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  47 + <xs:element ref="m2m:subscription" />
  48 + <xs:element ref="m2m:transaction" />
  49 + </xs:choice>
46 50 </xs:choice>
47 51 </xs:sequence>
48 52 </xs:extension>
... ...
... ... @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-policyDeletionRules-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  32 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
32 33  
33 34 <xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
34 35 <xs:complexType>
... ... @@ -49,6 +50,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
49 50 <xs:choice minOccurs="1" maxOccurs="unbounded">
50 51 <xs:element ref="m2m:policyDeletionRules" />
51 52 <xs:element ref="m2m:subscription" />
  53 + <xs:element ref="m2m:transaction" />
52 54 </xs:choice>
53 55 </xs:choice>
54 56 </xs:sequence>
... ...
... ... @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
28 28 elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
31 32  
32 33  
33 34 <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
49 50 <xs:choice minOccurs="0" maxOccurs="1">
50 51 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
51 52 <xs:choice minOccurs="1" maxOccurs="unbounded">
52   - <xs:element ref="m2m:subscription" />
  53 + <xs:element ref="m2m:subscription" />
  54 + <xs:element ref="m2m:transaction" />
53 55 </xs:choice>
54 56 </xs:choice>
55 57 </xs:sequence>
... ... @@ -76,6 +78,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
76 78 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
77 79 <xs:choice minOccurs="1" maxOccurs="unbounded">
78 80 <xs:element ref="m2m:subscription" />
  81 + <xs:element ref="m2m:transaction" />
79 82 </xs:choice>
80 83 </xs:choice>
81 84 </xs:sequence>
... ...
... ... @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-ontology-v3_8_0.xsd" />
  32 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
32 33  
33 34  
34 35 <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
47 48 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
48 49 <xs:choice minOccurs="1" maxOccurs="unbounded">
49 50 <xs:element ref="m2m:subscription" />
50   - <xs:element ref="m2m:ontology" />
  51 + <xs:element ref="m2m:ontology" />
  52 + <xs:element ref="m2m:transaction" />
51 53 </xs:choice>
52 54 </xs:choice>
53 55 </xs:sequence>
... ... @@ -72,6 +74,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
72 74 <xs:element ref="m2m:subscription" />
73 75 <xs:element ref="m2m:ontology" />
74 76 <xs:element ref="m2m:ontologyAnnc" />
  77 + <xs:element ref="m2m:transaction" />
75 78 </xs:choice>
76 79 </xs:choice>
77 80 </xs:sequence>
... ...
... ... @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
28 28  
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
31 32  
32 33 <xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
33 34 <xs:complexType>
... ... @@ -41,8 +42,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
41 42  
42 43 <!-- Child Resources -->
43 44 <xs:choice minOccurs="0" maxOccurs="1">
44   - <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
45   - <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
  45 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  46 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  47 + <xs:element ref="m2m:subscription" />
  48 + <xs:element ref="m2m:transaction" />
  49 + </xs:choice>
46 50 </xs:choice>
47 51 </xs:sequence>
48 52 </xs:extension>
... ...
... ... @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29  
30 30 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  32 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
32 33  
33 34 <xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
34 35 <xs:complexType>
... ... @@ -36,7 +37,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
36 37 <!-- Inherit common attributes -->
37 38 <xs:extension base="m2m:subordinateResource">
38 39 <xs:sequence>
39   - <!-- No Resource Specific Attributes and no child resources -->
  40 + <!-- No Resource Specific Attributes -->
  41 +
  42 + <!-- Child Resources -->
  43 + <xs:choice minOccurs="0" maxOccurs="1">
  44 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  45 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  46 + <xs:element ref="m2m:transaction" />
  47 + </xs:choice>
  48 + </xs:choice>
40 49 </xs:sequence>
41 50 </xs:extension>
42 51 </xs:complexContent>
... ...
... ... @@ -41,6 +41,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
41 41 <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_8_0.xsd" />
42 42 <xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
43 43 <xs:include schemaLocation="CDT-crossResourceSubscription-v3_8_0.xsd" />
  44 + <xs:include schemaLocation="CDT-transactionMgmt-v3_8_0.xsd" />
  45 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd" />
44 46  
45 47 <xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
46 48 <xs:complexType>
... ... @@ -93,6 +95,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
93 95 <xs:element ref="m2m:semanticMashupInstance" />
94 96 <xs:element ref="m2m:semanticMashupInstanceAnnc" />
95 97 <xs:element ref="m2m:crossResourceSubscription" />
  98 + <xs:element ref="m2m:transactionMgmt" />
  99 + <xs:element ref="m2m:transaction" />
96 100 </xs:choice>
97 101 </xs:choice>
98 102 </xs:sequence>
... ... @@ -149,6 +153,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
149 153 <xs:element ref="m2m:semanticMashupInstance" />
150 154 <xs:element ref="m2m:semanticMashupInstanceAnnc" />
151 155 <xs:element ref="m2m:crossResourceSubscription" />
  156 + <xs:element ref="m2m:transactionMgmt" />
  157 + <xs:element ref="m2m:transaction" />
152 158 </xs:choice>
153 159 </xs:choice>
154 160 </xs:sequence>
... ...
... ... @@ -26,7 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
26 26  
27 27 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
28 28 elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  29 + <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
29 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
30 32  
31 33 <xs:element name="role" substitutionGroup="m2m:sg_regularResource">
32 34 <xs:complexType>
... ... @@ -47,6 +49,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
47 49 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
48 50 <xs:choice minOccurs="1" maxOccurs="unbounded">
49 51 <xs:element ref="m2m:subscription" />
  52 + <xs:element ref="m2m:transaction" />
50 53 </xs:choice>
51 54 </xs:choice>
52 55 </xs:sequence>
... ...
... ... @@ -43,7 +43,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
43 43 <xs:choice minOccurs="0" maxOccurs="1">
44 44 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
45 45 <xs:choice minOccurs="1" maxOccurs="unbounded">
46   - <xs:element ref="m2m:subscription"></xs:element>
  46 + <xs:element ref="m2m:subscription" />
  47 + <xs:element ref="m2m:transaction" />
47 48 </xs:choice>
48 49 </xs:choice>
49 50 </xs:sequence>
... ... @@ -60,6 +61,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
60 61 <!-- Resource Specific Attributes -->
61 62 <xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" />
62 63 <xs:element name="networkCoordinated" type="xs:boolean" />
  64 +
  65 + <!-- Child Resources -->
  66 + <xs:choice minOccurs="0" maxOccurs="1">
  67 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  68 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  69 + <xs:element ref="m2m:transaction" />
  70 + </xs:choice>
  71 + </xs:choice>
63 72 </xs:sequence>
64 73 </xs:extension>
65 74 </xs:complexContent>
... ...
... ... @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
28 28  
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
31 32  
32 33 <xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
33 34 <xs:complexType>
... ... @@ -48,8 +49,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
48 49  
49 50 <!-- Child Resources -->
50 51 <xs:choice minOccurs="0" maxOccurs="1">
51   - <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
52   - <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
  52 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  53 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  54 + <xs:element ref="m2m:subscription" />
  55 + <xs:element ref="m2m:transaction" />
  56 + </xs:choice>
53 57 </xs:choice>
54 58 </xs:sequence>
55 59 </xs:extension>
... ... @@ -74,8 +78,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
74 78  
75 79 <!-- Child Resources -->
76 80 <xs:choice minOccurs="0" maxOccurs="1">
77   - <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
78   - <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
  81 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  82 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  83 + <xs:element ref="m2m:subscription" />
  84 + <xs:element ref="m2m:transaction" />
  85 + </xs:choice>
79 86 </xs:choice>
80 87 </xs:sequence>
81 88 </xs:extension>
... ...
... ... @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-semanticMashupResult-v3_8_0.xsd" />
32 32 <xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
  33 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
33 34  
34 35 <xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
35 36 <xs:complexType>
... ... @@ -57,6 +58,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
57 58 <xs:element ref="m2m:subscription" />
58 59 <xs:element ref="m2m:semanticMashupResult" />
59 60 <xs:element ref="m2m:semanticDescriptor" />
  61 + <xs:element ref="m2m:transaction" />
60 62  
61 63 </xs:choice>
62 64 </xs:choice>
... ... @@ -90,6 +92,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
90 92 <xs:element ref="m2m:semanticMashupResultAnnc" />
91 93 <xs:element ref="m2m:semanticDescriptor" />
92 94 <xs:element ref="m2m:semanticDescriptorAnnc" />
  95 + <xs:element ref="m2m:transaction" />
93 96  
94 97 </xs:choice>
95 98 </xs:choice>
... ...
... ... @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-semanticMashupInstance-v3_8_0.xsd" />
32 32 <xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
  33 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
33 34  
34 35 <xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
35 36 <xs:complexType>
... ... @@ -54,7 +55,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
54 55 <xs:choice minOccurs="1" maxOccurs="unbounded">
55 56 <xs:element ref="m2m:subscription" />
56 57 <xs:element ref="m2m:semanticMashupInstance" />
57   - <xs:element ref="m2m:semanticDescriptor" />
  58 + <xs:element ref="m2m:semanticDescriptor" />
  59 + <xs:element ref="m2m:transaction" />
58 60 </xs:choice>
59 61 </xs:choice>
60 62 </xs:sequence>
... ... @@ -86,6 +88,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
86 88 <xs:element ref="m2m:semanticMashupInstanceAnnc" />
87 89 <xs:element ref="m2m:semanticDescriptor" />
88 90 <xs:element ref="m2m:semanticDescriptorAnnc" />
  91 + <xs:element ref="m2m:transaction" />
89 92 </xs:choice>
90 93 </xs:choice>
91 94 </xs:sequence>
... ...
... ... @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
28 28 elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
29 29 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
31 32  
32 33 <xs:element name="semanticMashupResult" substitutionGroup="m2m:sg_regularResource">
33 34 <xs:complexType>
... ... @@ -49,6 +50,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
49 50 <xs:choice minOccurs="1" maxOccurs="unbounded">
50 51 <xs:element ref="m2m:subscription" />
51 52 <xs:element ref="m2m:semanticDescriptor" />
  53 + <xs:element ref="m2m:transaction" />
52 54 </xs:choice>
53 55 </xs:choice>
54 56 </xs:sequence>
... ... @@ -77,6 +79,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
77 79 <xs:element ref="m2m:subscription" />
78 80 <xs:element ref="m2m:semanticDescriptor" />
79 81 <xs:element ref="m2m:semanticDescriptorAnnc" />
  82 + <xs:element ref="m2m:transaction" />
80 83 </xs:choice>
81 84 </xs:choice>
82 85 </xs:sequence>
... ...
... ... @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
28 28  
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
31 32  
32 33 <xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
33 34 <xs:complexType>
... ... @@ -52,8 +53,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
52 53  
53 54 <!-- Child Resources -->
54 55 <xs:choice minOccurs="0" maxOccurs="1">
55   - <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
56   - <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
  56 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  57 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  58 + <xs:element ref="m2m:subscription" />
  59 + <xs:element ref="m2m:transaction" />
  60 + </xs:choice>
57 61 </xs:choice>
58 62 </xs:sequence>
59 63 </xs:extension>
... ...
... ... @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
28 28  
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
31 32  
32 33 <xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
33 34 <xs:complexType>
... ... @@ -48,8 +49,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
48 49  
49 50 <!-- Child Resources -->
50 51 <xs:choice minOccurs="0" maxOccurs="1">
51   - <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
52   - <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
  52 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  53 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  54 + <xs:element ref="m2m:subscription" />
  55 + <xs:element ref="m2m:transaction" />
  56 + </xs:choice>
53 57 </xs:choice>
54 58 </xs:sequence>
55 59 </xs:extension>
... ...
... ... @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
28 28  
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
31 32  
32 33 <xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
33 34 <xs:complexType>
... ... @@ -48,8 +49,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
48 49  
49 50 <!-- Child Resources -->
50 51 <xs:choice minOccurs="0" maxOccurs="1">
51   - <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
52   - <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
  52 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  53 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  54 + <xs:element ref="m2m:subscription" />
  55 + <xs:element ref="m2m:transaction" />
  56 + </xs:choice>
53 57 </xs:choice>
54 58 </xs:sequence>
55 59 </xs:extension>
... ...
... ... @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
30 30 <xs:include schemaLocation="CDT-eventConfig-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  32 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
32 33  
33 34 <xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
34 35 <xs:complexType>
... ... @@ -46,6 +47,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
46 47 <xs:choice minOccurs="1" maxOccurs="unbounded">
47 48 <xs:element ref="m2m:eventConfig" />
48 49 <xs:element ref="m2m:subscription" />
  50 + <xs:element ref="m2m:transaction" />
49 51 </xs:choice>
50 52 </xs:choice>
51 53 </xs:sequence>
... ...
... ... @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 30 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-schedule-v3_8_0.xsd" />
32 32 <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v3_8_0.xsd" />
  33 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
33 34  
34 35 <xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
35 36 <xs:complexType>
... ... @@ -62,6 +63,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
62 63 <xs:choice minOccurs="1" maxOccurs="unbounded">
63 64 <xs:element ref="m2m:schedule" />
64 65 <xs:element ref="m2m:notificationTargetMgmtPolicyRef" />
  66 + <xs:element ref="m2m:transaction" />
65 67 </xs:choice>
66 68 </xs:choice>
67 69 </xs:sequence>
... ...
... ... @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 30 <xs:include schemaLocation="CDT-timeSeriesInstance-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
32 32 <xs:include schemaLocation="CDT-semanticDescriptor-v3_8_0.xsd" />
  33 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
33 34  
34 35  
35 36 <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
61 62 <xs:element ref="m2m:timeSeriesInstance" />
62 63 <xs:element ref="m2m:subscription" />
63 64 <xs:element ref="m2m:semanticDescriptor" />
  65 + <xs:element ref="m2m:transaction" />
64 66 </xs:choice>
65 67 </xs:choice>
66 68 </xs:sequence>
... ... @@ -82,8 +84,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
82 84 <xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
83 85 <xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
84 86 <xs:element name="currentByteSize" type="xs:nonNegativeInteger" />
85   - <xs:element name="periodicInterval" type="xs:nonNegativeInteger" minOccurs="0" />
86   - <xs:element name="missingDataDetect" type="xs:boolean" minOccurs="0" />
  87 + <xs:element name="periodicInterval" type="xs:nonNegativeInteger" minOccurs="0" />
  88 + <xs:element name="missingDataMaxNr" type="xs:nonNegativeInteger" minOccurs="0" />
87 89 <xs:element name="missingDataList" type="m2m:missingDataList" minOccurs="0" />
88 90 <xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
89 91 <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
99 101 <xs:element ref="m2m:subscription" />
100 102 <xs:element ref="m2m:semanticDescriptor" />
101 103 <xs:element ref="m2m:semanticDescriptorAnnc" />
  104 + <xs:element ref="m2m:transaction" />
102 105 </xs:choice>
103 106 </xs:choice>
104 107 </xs:sequence>
... ...
... ... @@ -27,6 +27,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
27 27 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
28 28 elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
29 29 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
  30 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
30 31  
31 32 <xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
32 33 <xs:complexType>
... ... @@ -40,7 +41,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
40 41 <xs:element name="contentSize" type="xs:nonNegativeInteger" />
41 42  
42 43 <!-- Child Resources -->
43   -
  44 + <xs:choice minOccurs="0" maxOccurs="1">
  45 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  46 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  47 + <xs:element ref="m2m:transaction" />
  48 + </xs:choice>
  49 + </xs:choice>
44 50 </xs:sequence>
45 51 </xs:extension>
46 52 </xs:complexContent>
... ... @@ -58,7 +64,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
58 64 <xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0" />
59 65  
60 66 <!-- Child Resources -->
61   -
  67 + <xs:choice minOccurs="0" maxOccurs="1">
  68 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  69 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  70 + <xs:element ref="m2m:transaction" />
  71 + </xs:choice>
  72 + </xs:choice>
62 73 </xs:sequence>
63 74 </xs:extension>
64 75 </xs:complexContent>
... ...
... ... @@ -26,7 +26,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
26 26  
27 27 <xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
28 28 elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  29 +
  30 + <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
29 31 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  32 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
  33 +
30 34  
31 35 <xs:element name="token" substitutionGroup="m2m:sg_regularResource">
32 36 <xs:complexType>
... ... @@ -51,6 +55,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
51 55 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
52 56 <xs:choice minOccurs="1" maxOccurs="unbounded">
53 57 <xs:element ref="m2m:subscription" />
  58 + <xs:element ref="m2m:transaction" />
54 59 </xs:choice>
55 60 </xs:choice>
56 61 </xs:sequence>
... ...
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!--
  3 +Copyright Notification
  4 +
  5 +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
  6 +contained in the original materials on any copies of the materials and that you comply strictly with these terms.
  7 +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
  8 +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
  9 +© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
  10 +
  11 +
  12 +Notice of Disclaimer & Limitation of Liability
  13 +
  14 +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
  15 +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
  16 +No recommendation as to products or vendors is made or should be implied.
  17 +
  18 +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
  19 +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
  20 +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
  21 +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
  22 +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
  23 +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
  24 +
  25 +-->
  26 +
  27 +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
  28 + xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  29 +
  30 + <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  32 + <xs:include schemaLocation="CDT-responsePrimitive-v3_8_0.xsd" />
  33 +
  34 + <xs:element name="transaction" substitutionGroup="m2m:sg_regularResource">
  35 + <xs:complexType>
  36 + <xs:complexContent>
  37 + <!-- Inherit common attributes from RegularResource Type -->
  38 + <xs:extension base="m2m:regularResource">
  39 + <xs:sequence>
  40 + <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
  41 + <xs:element name="creator" type="m2m:ID" minOccurs="0" />
  42 + <!-- Resource Specific Attributes -->
  43 + <xs:element name="transactionID" type="xs:string" />
  44 + <xs:element name="transactionControl" type="m2m:transactionControl" />
  45 + <xs:element name="transactionState" type="m2m:transactionState" />
  46 + <xs:element name="transactionLockTime" type="m2m:timestamp" minOccurs="0" />
  47 + <xs:element name="transactionExecuteTime" type="m2m:timestamp" minOccurs="0" />
  48 + <xs:element name="transactionCommitTime" type="m2m:timestamp" minOccurs="0" />
  49 + <xs:element name="transactionLockType" type="m2m:transactionLockType" minOccurs="0" />
  50 + <xs:element ref="m2m:requestPrimitive" />
  51 + <xs:element ref="m2m:responsePrimitive" />
  52 +
  53 + <!-- Child Resources -->
  54 + <xs:choice minOccurs="0" maxOccurs="1">
  55 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  56 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  57 + <xs:element ref="m2m:subscription" />
  58 + </xs:choice>
  59 + </xs:choice>
  60 + </xs:sequence>
  61 + </xs:extension>
  62 + </xs:complexContent>
  63 + </xs:complexType>
  64 + </xs:element>
  65 +
  66 +</xs:schema>
... ...
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!--
  3 +Copyright Notification
  4 +
  5 +The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
  6 +contained in the original materials on any copies of the materials and that you comply strictly with these terms.
  7 +This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
  8 +any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
  9 +© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
  10 +
  11 +
  12 +Notice of Disclaimer & Limitation of Liability
  13 +
  14 +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
  15 +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
  16 +No recommendation as to products or vendors is made or should be implied.
  17 +
  18 +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
  19 +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
  20 +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
  21 +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
  22 +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
  23 +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
  24 +
  25 +-->
  26 +
  27 +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
  28 + xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  29 +
  30 + <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
  31 + <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  32 + <xs:include schemaLocation="CDT-responsePrimitive-v3_8_0.xsd" />
  33 +
  34 + <xs:element name="transactionMgmt" substitutionGroup="m2m:sg_regularResource">
  35 + <xs:complexType>
  36 + <xs:complexContent>
  37 + <!-- Inherit common attributes from RegularResource Type -->
  38 + <xs:extension base="m2m:regularResource">
  39 + <xs:sequence>
  40 + <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
  41 + <xs:element name="creator" type="m2m:ID" minOccurs="0" />
  42 + <!-- Resource Specific Attributes -->
  43 + <xs:element name="transactionLockTime" type="m2m:timestamp" minOccurs="0" />
  44 + <xs:element name="transactionExecuteTime" type="m2m:timestamp" minOccurs="0" />
  45 + <xs:element name="transactionCommitTime" type="m2m:timestamp" minOccurs="0" />
  46 + <xs:element name="transactionExpirationTime" type="m2m:timestamp" minOccurs="0" />
  47 + <xs:element name="transactionMode" type="m2m:transactionMode" minOccurs="0" />
  48 + <xs:element name="transactionLockType" type="m2m:transactionLockType" minOccurs="0" />
  49 + <xs:element name="transactionControl" type="m2m:transactionControl" minOccurs="0" />
  50 + <xs:element name="transactionState" type="m2m:transactionState" />
  51 + <xs:element name="transactionMaxRetries" type="xs:nonNegativeInteger" minOccurs="0" />
  52 + <xs:element name="transactionMgmtHandling" type="m2m:transactionMgmtHandling" minOccurs="0" />
  53 + <xs:element name="requestPrimitives" type="m2m:aggregatedRequest" />
  54 + <xs:element name="responsePrimitives" type="m2m:aggregatedResponse" />
  55 +
  56 + <!-- Child Resources -->
  57 + <xs:choice minOccurs="0" maxOccurs="1">
  58 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  59 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  60 + <xs:element ref="m2m:subscription" />
  61 + </xs:choice>
  62 + </xs:choice>
  63 + </xs:sequence>
  64 + </xs:extension>
  65 + </xs:complexContent>
  66 + </xs:complexType>
  67 + </xs:element>
  68 +
  69 +</xs:schema>
... ...
... ... @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29  
30 30 <xs:include schemaLocation="CDT-commonTypes-v3_8_0.xsd" />
31 31 <xs:include schemaLocation="CDT-subscription-v3_8_0.xsd" />
  32 + <xs:include schemaLocation="CDT-transaction-v3_8_0.xsd"/>
32 33  
33 34 <xs:element name="triggerRequest" substitutionGroup="m2m:sg_regularResource">
34 35 <xs:complexType>
... ... @@ -53,6 +54,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
53 54 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
54 55 <xs:choice minOccurs="1" maxOccurs="unbounded">
55 56 <xs:element ref="m2m:subscription" />
  57 + <xs:element ref="m2m:transaction" />
56 58 </xs:choice>
57 59 </xs:choice>
58 60 </xs:sequence>
... ...