diff --git a/CDT-AE.xsd b/CDT-AE.xsd index 38eb395fbc55f218a3f29d541148ea1feb455dfa..9ea0686c4a745b7f300f960ff350accfe3493566 100644 --- a/CDT-AE.xsd +++ b/CDT-AE.xsd @@ -41,7 +41,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-transactionMgmt.xsd" /> <xs:include schemaLocation="CDT-transaction.xsd" /> <xs:include schemaLocation="CDT-e2eQosSession.xsd" /> - + <xs:include schemaLocation="CDT-timeSyncBeacon.xsd" /> + <xs:element name="AE" substitutionGroup="m2m:sg_announceableResource"> <xs:complexType> <xs:complexContent> @@ -86,6 +87,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:transactionMgmt" /> <xs:element ref="m2m:transaction" /> <xs:element ref="m2m:e2eQosSession" /> + <xs:element ref="m2m:timeSyncBeacon" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-CSEBase.xsd b/CDT-CSEBase.xsd index e1d3b2d59a1aee60e1cca1262a0ac3d2a9ac70c1..97bedae0c06e4ffaacb6f4b0a6fb8d5f4a68d134 100644 --- a/CDT-CSEBase.xsd +++ b/CDT-CSEBase.xsd @@ -60,6 +60,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-transaction.xsd" /> <xs:include schemaLocation="CDT-semanticRuleRepository.xsd" /> <xs:include schemaLocation="CDT-e2eQosSession.xsd" /> + <xs:include schemaLocation="CDT-timeSyncBeacon.xsd" /> <xs:element name="CSEBase" substitutionGroup="m2m:sg_resource"> <xs:complexType> @@ -123,6 +124,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:transaction" /> <xs:element ref="m2m:semanticRuleRepository" /> <xs:element ref="m2m:e2eQosSession" /> + <xs:element ref="m2m:timeSyncBeacon" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd index d28915d1fba51d0eb3a1b65d6433edf8471bb28f..73f1056a4f8cc8ff272668cf0717e5c5ba64548e 100644 --- a/CDT-enumerationTypes.xsd +++ b/CDT-enumerationTypes.xsd @@ -149,6 +149,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:enumeration value="58" /> <!-- e2eQosSession --> <xs:enumeration value="59" /> + <!-- timeSyncBeacon --> + <xs:enumeration value="60" /> <!-- accessControlPolicyAnnc --> <xs:enumeration value="10001" /> <!-- AEAnnc --> @@ -202,6 +204,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:enumeration value="10056" /> <!-- semanticRuleRepositoryAnnc --> <xs:enumeration value="10057" /> + <!-- timeSyncBeaconAnnc --> + <xs:enumeration value="10060" /> </xs:restriction> </xs:simpleType> @@ -666,6 +670,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:enumeration value="58" /> <!-- e2eQosSession --> <xs:enumeration value="59" /> + <!-- timeSyncBeacon --> + <xs:enumeration value="60" /> <!-- accessControlPolicyAnnc --> <xs:enumeration value="10001" /> <!-- AEAnnc --> @@ -721,6 +727,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:enumeration value="10056" /> <!-- semanticRuleRepositoryAnnc --> <xs:enumeration value="10057" /> + <!-- timeSyncBeaconAnnc --> + <xs:enumeration value="10060" /> <!-- oldest --> <xs:enumeration value="20001" /> <!-- latest --> @@ -1927,5 +1935,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> + <xs:simpleType name="beaconCriteria"> + <xs:annotation> + <xs:documentation>Used for the beaconCriteria attribute of the timeSyncBeacon resource</xs:documentation> + </xs:annotation> + <xs:restriction base="xs:integer"> + <!-- PERIODIC --> + <xs:enumeration value="1" /> + <!-- LOSS_OF_SYNCHRONIZATION --> + <xs:enumeration value="2" /> + </xs:restriction> + </xs:simpleType> + </xs:schema> diff --git a/CDT-notification.xsd b/CDT-notification.xsd index b7e6c18b0a739459a40bc43f09f533d5910129d3..98c07e7071f197b468b39c725ca0e1db599edc34 100644 --- a/CDT-notification.xsd +++ b/CDT-notification.xsd @@ -26,7 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:include schemaLocation="CDT-commonTypes.xsd"/> <xs:include schemaLocation="CDT-responsePrimitive.xsd"/> - + <xs:include schemaLocation="CDT-timeSyncBeacon.xsd"/> + <xs:element name="notification" type="m2m:notification" /> @@ -147,5 +148,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:any namespace="##other" processContents="lax" /> </xs:choice> </xs:complexType> + + <xs:element name="timeSyncBeaconNotification" type="m2m:timeSyncBeaconNotification" /> + </xs:schema> diff --git a/CDT-remoteCSE.xsd b/CDT-remoteCSE.xsd index d9aa24d063f453cd30c0266904480f1139c299f0..5937fc9ead98e9084b4a79fe72de7bcbd490058f 100644 --- a/CDT-remoteCSE.xsd +++ b/CDT-remoteCSE.xsd @@ -43,6 +43,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:include schemaLocation="CDT-transactionMgmt.xsd" /> <xs:include schemaLocation="CDT-transaction.xsd" /> <xs:include schemaLocation="CDT-e2eQosSession.xsd" /> + <xs:include schemaLocation="CDT-timeSyncBeacon.xsd" /> <xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource"> <xs:complexType> @@ -98,6 +99,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element ref="m2m:transactionMgmt" /> <xs:element ref="m2m:transaction" /> <xs:element ref="m2m:e2eQosSession" /> + <xs:element ref="m2m:timeSyncBeacon" /> + <xs:element ref="m2m:timeSyncBeaconAnnc" /> </xs:choice> </xs:choice> </xs:sequence> diff --git a/CDT-timeSyncBeacon.xsd b/CDT-timeSyncBeacon.xsd new file mode 100644 index 0000000000000000000000000000000000000000..0c934497fbd055a29b3456c37d75e177f94de25c --- /dev/null +++ b/CDT-timeSyncBeacon.xsd @@ -0,0 +1,96 @@ +<?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" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + 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="timeSyncBeacon" substitutionGroup="m2m:sg_announceableResource"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes for announceable Resources --> + <xs:extension base="m2m:announceableResource"> + <xs:sequence> + <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources --> + + <!-- Resource Specific Attributes --> + <xs:element name="beaconRequestor" type="m2m:ID" minOccurs="0"/> + <xs:element name="beaconCriteria" type="m2m:beaconCriteria"/> + <xs:element name="beaconInterval" type="xs:duration" minOccurs="0" /> + <xs:element name="beaconThreshold" type="xs:duration" minOccurs="0" /> + <xs:element name="beaconNotificationURIs" type="m2m:listOfURIs"/> + + <!-- 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> + </xs:complexType> + </xs:element> + + <xs:element name="timeSyncBeaconAnnc" substitutionGroup="m2m:sg_announcedResource"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes for announceable Resources --> + <xs:extension base="m2m:announcedResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="beaconRequestor" type="m2m:ID" minOccurs="0"/> + <xs:element name="beaconCriteria" type="m2m:beaconCriteria" minOccurs="0"/> + <xs:element name="beaconInterval" type="xs:duration" minOccurs="0"/> + <xs:element name="beaconThreshold" type="xs:duration" minOccurs="0"/> + <xs:element name="beaconNotificationURIs" type="m2m:listOfURIs" minOccurs="0"/> + + <!-- Child Resources --> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> + <xs:choice minOccurs="1" maxOccurs="unbounded"> + <xs:element ref="m2m:transaction" /> + </xs:choice> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:complexType name="timeSyncBeaconNotification"> + <xs:sequence> + <xs:element name="timeSyncBeaconReference" type="xs:anyURI"/> + <xs:element name="currentTime" type="m2m:timestamp"/> + <xs:element name="timeOffset" type="xs:duration" minOccurs="0" /> + </xs:sequence> + </xs:complexType> + +</xs:schema>