diff --git a/CDT-AE.xsd b/CDT-AE.xsd index fb8e0ee69e1214cc231e6f8c381c0fd71b750fa6..e84de8886349b32c1c8a62658c0f212fdc9913f2 100644 --- a/CDT-AE.xsd +++ b/CDT-AE.xsd @@ -39,6 +39,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-multimediaSession.xsd" /> <xs:include schemaLocation="CDT-crossResourceSubscription.xsd" /> <xs:include schemaLocation="CDT-triggerRequest.xsd" /> + <xs:include schemaLocation="CDT-transactionMgmt.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-AEContactList.xsd b/CDT-AEContactList.xsd index f46eaa9c391fae351c4cc47b586e892dae1fda06..959daf9419a88cc3717d435558945c2e5b4a465b 100644 --- a/CDT-AEContactList.xsd +++ b/CDT-AEContactList.xsd @@ -30,7 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-AEContactListPerCSE.xsd" /> - + <xs:include schemaLocation="CDT-transaction.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/CDT-CSEBase.xsd b/CDT-CSEBase.xsd index c30213516b6522b29171e2d223a5db1a4af99f93..5d583f61d2c4763b9ee20d2461af9dc69caa14da 100644 --- a/CDT-CSEBase.xsd +++ b/CDT-CSEBase.xsd @@ -55,6 +55,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-AEContactList.xsd" /> <xs:include schemaLocation="CDT-localMulticastGroup.xsd" /> <xs:include schemaLocation="CDT-crossResourceSubscription.xsd" /> + <xs:include schemaLocation="CDT-backgroundDataTransfer.xsd" /> + <xs:include schemaLocation="CDT-transactionMgmt.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-accessControlPolicy.xsd b/CDT-accessControlPolicy.xsd index 55b62933e9c2cd0c3ec92a2a9767d6a3f08fb5e6..ab23f04b96af972388aa7ca81aa00e10d5459d02 100644 --- a/CDT-accessControlPolicy.xsd +++ b/CDT-accessControlPolicy.xsd @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd"/> <xs:include schemaLocation="CDT-subscription.xsd"/> + <xs:include schemaLocation="CDT-transaction.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/CDT-authorizationDecision.xsd b/CDT-authorizationDecision.xsd index 82084b8b5d0d071c00db516dc306173fe1d91d32..04237bffaae3f8cfd46a13d18fe799424336b819 100644 --- a/CDT-authorizationDecision.xsd +++ b/CDT-authorizationDecision.xsd @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-authorizationInformation.xsd b/CDT-authorizationInformation.xsd index 880e8e59279c17cc340cdfd4b6236a560df62bdf..909f4f005cc88465d425f8158acbc5b39a8a9aed 100644 --- a/CDT-authorizationInformation.xsd +++ b/CDT-authorizationInformation.xsd @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-role.xsd" /> <xs:include schemaLocation="CDT-token.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-authorizationPolicy.xsd b/CDT-authorizationPolicy.xsd index b249183d6ae747e2a08b3422a01167e26d0b1e2c..49b6e264922adcaf062ba895343f3c505c5a8ad1 100644 --- a/CDT-authorizationPolicy.xsd +++ b/CDT-authorizationPolicy.xsd @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-backgroundDataTransfer.xsd b/CDT-backgroundDataTransfer.xsd new file mode 100644 index 0000000000000000000000000000000000000000..97880788d6f7103f8c21bcee6ba38e09f6757b10 --- /dev/null +++ b/CDT-backgroundDataTransfer.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.xsd" /> + <xs:include schemaLocation="CDT-subscription.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/CDT-commonTypes.xsd b/CDT-commonTypes.xsd index 73e949cebc1d64a3832e4d8bb6a942bd02ba189f..f3d24471e7306652c2dd23c7ea7afc97fca7f7be 100644 --- a/CDT-commonTypes.xsd +++ b/CDT-commonTypes.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/CDT-container.xsd b/CDT-container.xsd index db974b3d4f98fbe2b31950fd0c8445f1e3aa431f..690ddfd1ca0469795a873ce999d2bf5ae22d6b57 100644 --- a/CDT-container.xsd +++ b/CDT-container.xsd @@ -31,6 +31,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-semanticDescriptor.xsd" /> <xs:include schemaLocation="CDT-timeSeries.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-contentInstance.xsd b/CDT-contentInstance.xsd index 611dfce7817952946ef5d2ae50d8d9ccd0496786..3b03195c8d7b8a3765d8ce71fd21bd869d9ea4ab 100644 --- a/CDT-contentInstance.xsd +++ b/CDT-contentInstance.xsd @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-semanticDescriptor.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-crossResourceSubscription.xsd b/CDT-crossResourceSubscription.xsd index bff9afca09d845b1bfc13a289d1a07dc18b7daac..88e426ad1a6b2f59dd7cb4e5e0d6ac82b387e7ab 100644 --- a/CDT-crossResourceSubscription.xsd +++ b/CDT-crossResourceSubscription.xsd @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-schedule.xsd" /> <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-dynamicAuthorizationConsultation.xsd b/CDT-dynamicAuthorizationConsultation.xsd index c2728c832e53f9b98bb8dca9889aabbf0aa1404b..5c365290b1e5e3b8ed543fa51e470e2488fe604c 100644 --- a/CDT-dynamicAuthorizationConsultation.xsd +++ b/CDT-dynamicAuthorizationConsultation.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.xsd" /> + <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd index c932f97625a7a47f54bc6810a2b3ba8038de063a..87963201db5b665c5f620c49529ed23a22aba250 100644 --- a/CDT-enumerationTypes.xsd +++ b/CDT-enumerationTypes.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/CDT-eventConfig.xsd b/CDT-eventConfig.xsd index 1544e1f668be57e36dab1d3b73e6a4ecc99a188e..0a166ec662dd9cfb0d77d8cd7c983b62a1d933c0 100644 --- a/CDT-eventConfig.xsd +++ b/CDT-eventConfig.xsd @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-execInstance.xsd b/CDT-execInstance.xsd index 3792ca5fcdef74359727f13855dfe669d32b62ef..79875bcd06a28f2dd477b9635ad1eb007d7386ba 100644 --- a/CDT-execInstance.xsd +++ b/CDT-execInstance.xsd @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-group.xsd b/CDT-group.xsd index 81ce0be16bfa1d508d423e8c5bf1e311f224ad28..3ccc01575fac7c6134152816b24277e570fa41fd 100644 --- a/CDT-group.xsd +++ b/CDT-group.xsd @@ -30,6 +30,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-semanticDescriptor.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-locationPolicy.xsd b/CDT-locationPolicy.xsd index 4620c2dcf0d5e96401f280cca8e6e37162263a3c..753a0a31cf5198f7158d9265346d6bacc0bc88f9 100644 --- a/CDT-locationPolicy.xsd +++ b/CDT-locationPolicy.xsd @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-m2mServiceSubscriptionProfile.xsd b/CDT-m2mServiceSubscriptionProfile.xsd index 633ee549d9af7c374aa691b284a25f3459a3f299..bf0a27693b73a92462ab40f6672407b438b05636 100644 --- a/CDT-m2mServiceSubscriptionProfile.xsd +++ b/CDT-m2mServiceSubscriptionProfile.xsd @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-serviceSubscribedNode.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-mgmtCmd.xsd b/CDT-mgmtCmd.xsd index 12624d0ab1662a7fef1cd5bc0471298e24f923a7..5b125c64e5e9d2f539d03ec78291f06881bd5baf 100644 --- a/CDT-mgmtCmd.xsd +++ b/CDT-mgmtCmd.xsd @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-execInstance.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-multimediaSession.xsd b/CDT-multimediaSession.xsd index c858080515340f45e01343ef3132876ef8585f6b..d00f03eec08f100fac522b7b6f56187ef537d534 100644 --- a/CDT-multimediaSession.xsd +++ b/CDT-multimediaSession.xsd @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-accessControlPolicy.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-node.xsd b/CDT-node.xsd index 349c4142f8adf6fa0827f41453b4c6ed4bbcc18e..8017e2a7f259b2b5671a6b6b96a0f0ae5ca2eff3 100644 --- a/CDT-node.xsd +++ b/CDT-node.xsd @@ -42,6 +42,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-activeCmdhPolicy.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-semanticDescriptor.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-notificationTargetMgmtPolicyRef.xsd b/CDT-notificationTargetMgmtPolicyRef.xsd index 58eea2c23ef2d573c112c83fe70c6b4b883f2ebe..8f42da7eabd543a66fa04ed2c66c4d7d6bd13f77 100644 --- a/CDT-notificationTargetMgmtPolicyRef.xsd +++ b/CDT-notificationTargetMgmtPolicyRef.xsd @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-notificationTargetPolicy.xsd b/CDT-notificationTargetPolicy.xsd index 5908c98087fc212b6ac023d8827e0003bde0a797..4339fde1e8290f973fb5cec86c8b3536e53aa755 100644 --- a/CDT-notificationTargetPolicy.xsd +++ b/CDT-notificationTargetPolicy.xsd @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-policyDeletionRules.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-ontology.xsd b/CDT-ontology.xsd index 4f3d1e82f8e93147a13c23b03764be2818576c9f..b921857233a5493e38d419a56215325a8bc8617d 100644 --- a/CDT-ontology.xsd +++ b/CDT-ontology.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.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-ontologyRepository.xsd b/CDT-ontologyRepository.xsd index 3985b5b7355354b27eb4ca4b7570775f9f9a2878..141ec692d4c9e8d9c28695a1124a81acdcdc8f4a 100644 --- a/CDT-ontologyRepository.xsd +++ b/CDT-ontologyRepository.xsd @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-ontology.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-policyDeletionRules.xsd b/CDT-policyDeletionRules.xsd index 2e22753bcd7fe209edf15cb4b9d9d3948597b9a6..a6bd9c7317a838ef64589db1955fed8676bb7d08 100644 --- a/CDT-policyDeletionRules.xsd +++ b/CDT-policyDeletionRules.xsd @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-pollingChannel.xsd b/CDT-pollingChannel.xsd index d2a07b0d63207c584f18996df84149ecdc1b08a5..7c039b5b255d196235da52c04d5068bad76878f0 100644 --- a/CDT-pollingChannel.xsd +++ b/CDT-pollingChannel.xsd @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-remoteCSE.xsd b/CDT-remoteCSE.xsd index fe8cfbf7f5ac6b06e29339656a251286cc6ecb5c..e1dc15c24d48782cfbaf0f17866a9a93e28234cc 100644 --- a/CDT-remoteCSE.xsd +++ b/CDT-remoteCSE.xsd @@ -41,6 +41,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-semanticMashupJobProfile.xsd" /> <xs:include schemaLocation="CDT-semanticMashupInstance.xsd" /> <xs:include schemaLocation="CDT-crossResourceSubscription.xsd" /> + <xs:include schemaLocation="CDT-transactionMgmt.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-role.xsd b/CDT-role.xsd index 008b6562d5dc235d61df37b784cd42bd9e829015..d7af662e9c8551e7b2fa73c462a4b7975de53394 100644 --- a/CDT-role.xsd +++ b/CDT-role.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.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-schedule.xsd b/CDT-schedule.xsd index 3b213e7d8517882138b0325a2bfd916cc160d110..d045973e8279c9f432fd1719dc3e7ea40240716c 100644 --- a/CDT-schedule.xsd +++ b/CDT-schedule.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/CDT-semanticDescriptor.xsd b/CDT-semanticDescriptor.xsd index 705924886ac2ac3430eb8dc8ce5bf4e02b8c4b56..6a9a25c8968d2d11fcef0f7314bc81c67c0facd0 100644 --- a/CDT-semanticDescriptor.xsd +++ b/CDT-semanticDescriptor.xsd @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-semanticMashupInstance.xsd b/CDT-semanticMashupInstance.xsd index a5048c2a17d6f2383dbd81d3ba28c3f237b036e4..d456918efa52f1f4d7bae4075e59024173bdad02 100644 --- a/CDT-semanticMashupInstance.xsd +++ b/CDT-semanticMashupInstance.xsd @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-semanticMashupResult.xsd" /> <xs:include schemaLocation="CDT-semanticDescriptor.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-semanticMashupJobProfile.xsd b/CDT-semanticMashupJobProfile.xsd index 5a30318f2dcd9069c6032eb9a0c025b41aac7600..c9046f98e6ba9c9c4bba5ebd9bf63683e4a64baa 100644 --- a/CDT-semanticMashupJobProfile.xsd +++ b/CDT-semanticMashupJobProfile.xsd @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-semanticMashupInstance.xsd" /> <xs:include schemaLocation="CDT-semanticDescriptor.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-semanticMashupResult.xsd b/CDT-semanticMashupResult.xsd index f1c5e3c920d3deb325d88ff7a334ac372493572a..2efdf09464f784e7ca1fc1aef2f09b8f41acc18f 100644 --- a/CDT-semanticMashupResult.xsd +++ b/CDT-semanticMashupResult.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.xsd" /> <xs:include schemaLocation="CDT-semanticDescriptor.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-serviceSubscribedAppRule.xsd b/CDT-serviceSubscribedAppRule.xsd index 3b4f67efa6a9719b341de8d6426cd5f1cea5c27c..d35df72a18672fa2e4e658416b33d701683c8d29 100644 --- a/CDT-serviceSubscribedAppRule.xsd +++ b/CDT-serviceSubscribedAppRule.xsd @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-serviceSubscribedNode.xsd b/CDT-serviceSubscribedNode.xsd index f9e90c0c6195586a1c6984b96d9f1922fec183b3..c3b340ebac8eaae570ba47382722fb0d3f2b2fed 100644 --- a/CDT-serviceSubscribedNode.xsd +++ b/CDT-serviceSubscribedNode.xsd @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-statsCollect.xsd b/CDT-statsCollect.xsd index bb90b94b2bfcd4245be4b8dfccd36003a031583c..a39e61930db1e992af164d944b2b63140cf0798d 100644 --- a/CDT-statsCollect.xsd +++ b/CDT-statsCollect.xsd @@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-statsConfig.xsd b/CDT-statsConfig.xsd index b4fded90aa20edd2a2b0b0b078e63927e47acff2..5f70489748544c9e6ed0c6c3cc76a1e2fea0646b 100644 --- a/CDT-statsConfig.xsd +++ b/CDT-statsConfig.xsd @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-eventConfig.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-subscription.xsd b/CDT-subscription.xsd index 28805e0f16a43522e04f4471081780715ec82e91..ff4f6e9c38f396936d89c6264d4cf84834a46d10 100644 --- a/CDT-subscription.xsd +++ b/CDT-subscription.xsd @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-schedule.xsd" /> <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-timeSeries.xsd b/CDT-timeSeries.xsd index 1536889c745a1b504da85b432013e23a52f6676a..5d21411e91600a2b15484605145522ab463405d4 100644 --- a/CDT-timeSeries.xsd +++ b/CDT-timeSeries.xsd @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-timeSeriesInstance.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> <xs:include schemaLocation="CDT-semanticDescriptor.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-timeSeriesInstance.xsd b/CDT-timeSeriesInstance.xsd index e4ecd8f38769673e43305c2c2514cf492e741f79..9db7050ea23159a6cf482bb49c5f864c6694be7f 100644 --- a/CDT-timeSeriesInstance.xsd +++ b/CDT-timeSeriesInstance.xsd @@ -27,6 +27,8 @@ 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.xsd" /> + <xs:include schemaLocation="CDT-transaction.xsd"/> + <xs:include schemaLocation="CDT-semanticDescriptor.xsd"/> <xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource"> <xs:complexType> @@ -40,7 +42,13 @@ 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:element ref="m2m:semanticDescriptor" /> + </xs:choice> + </xs:choice> </xs:sequence> </xs:extension> </xs:complexContent> @@ -58,7 +66,13 @@ 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:element ref="m2m:semanticDescriptor" /> + </xs:choice> + </xs:choice> </xs:sequence> </xs:extension> </xs:complexContent> diff --git a/CDT-token.xsd b/CDT-token.xsd index 4292222cfc6364b08ab9634c39c09f6910d4ba35..14631dbbfdf605b0a4e8ac0cbdaf3ee8f8520d82 100644 --- a/CDT-token.xsd +++ b/CDT-token.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.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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/CDT-transaction.xsd b/CDT-transaction.xsd new file mode 100644 index 0000000000000000000000000000000000000000..dedb090c2be71d75d0844aad63ef4cbe10f5e361 --- /dev/null +++ b/CDT-transaction.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.xsd" /> + <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-responsePrimitive.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/CDT-transactionMgmt.xsd b/CDT-transactionMgmt.xsd new file mode 100644 index 0000000000000000000000000000000000000000..c32e3de70a26c872628482dd52aeeca7988d9b46 --- /dev/null +++ b/CDT-transactionMgmt.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.xsd" /> + <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-responsePrimitive.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/CDT-triggerRequest.xsd b/CDT-triggerRequest.xsd index e2d24b80f882af6b0346f4e9f18331f4527bd800..bb5e3493a6a46687c8299d74f13f71641cae95c2 100644 --- a/CDT-triggerRequest.xsd +++ b/CDT-triggerRequest.xsd @@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-commonTypes.xsd" /> <xs:include schemaLocation="CDT-subscription.xsd" /> + <xs:include schemaLocation="CDT-transaction.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>