Commit 373a31eae325888777e118df02cd569d2d1941cb

Authored by Wolfgang Granzow
1 parent a6f44af7

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

See detailed list of changes in PRO-2018-0238-PRO37_changes_of_XML_schemas_to_align_with_TS-0004
... ... @@ -794,31 +794,36 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
794 794 <xs:documentation></xs:documentation>
795 795 </xs:annotation>
796 796 <xs:restriction base="xs:integer">
797   - <!-- all attributes -->
  797 + <!-- All attributes -->
798 798 <xs:enumeration value="1" />
799   - <!-- modified attributes -->
  799 + <!-- Modified attributes -->
800 800 <xs:enumeration value="2" />
801 801 <!-- ResourceID -->
802 802 <xs:enumeration value="3" />
  803 + <!-- Trigger Payload -->
  804 + <xs:enumeration value="4" />
803 805 </xs:restriction>
804 806 </xs:simpleType>
805 807  
  808 +
806 809 <xs:simpleType name="notificationEventType">
807 810 <xs:annotation>
808 811 <xs:documentation>Used in the notificationEventType element of eventNotificationCriteria attribute of subscription resource
809 812 and in the Notification data object</xs:documentation>
810 813 </xs:annotation>
811 814 <xs:restriction base="xs:integer">
812   - <!-- Update of Resource -->
  815 + <!-- Update_of_Resource -->
813 816 <xs:enumeration value="1" />
814   - <!-- Delete of Resource -->
  817 + <!-- Delete_of_Resource -->
815 818 <xs:enumeration value="2" />
816   - <!-- Create of Direct Child Resource -->
  819 + <!-- Create_of_Direct_Child_Resource -->
817 820 <xs:enumeration value="3" />
818   - <!-- Delete of Direct Child Resource -->
  821 + <!-- Delete_of_Direct_Child_Resource -->
819 822 <xs:enumeration value="4" />
820   - <!-- Retrieve of Container Resource With No Child Resource -->
  823 + <!-- Retrieve_of_Container_Resource_With_No_Child_Resource -->
821 824 <xs:enumeration value="5" />
  825 + <!-- Trigger_Received_For_AE_Resource -->
  826 + <xs:enumeration value="6" />
822 827 </xs:restriction>
823 828 </xs:simpleType>
824 829  
... ... @@ -1625,5 +1630,33 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
1625 1630 </xs:restriction>
1626 1631 </xs:simpleType>
1627 1632  
  1633 + <xs:simpleType name="locationInformationType">
  1634 + <xs:annotation>
  1635 + <xs:documentation>Used in the locationInformationType attribute of the locationPolicy resource</xs:documentation>
  1636 + </xs:annotation>
  1637 + <xs:restriction base="xs:integer">
  1638 + <!-- Position fix -->
  1639 + <xs:enumeration value="1" />
  1640 + <!-- Geofence event -->
  1641 + <xs:enumeration value="2" />
  1642 + </xs:restriction>
  1643 + </xs:simpleType>
  1644 +
  1645 + <xs:simpleType name="geofenceEventCriteria">
  1646 + <xs:annotation>
  1647 + <xs:documentation>Used in the geofenceEventCriteria attribute of the locationPolicy resource</xs:documentation>
  1648 + </xs:annotation>
  1649 + <xs:restriction base="xs:integer">
  1650 + <!-- Entering -->
  1651 + <xs:enumeration value="1" />
  1652 + <!-- Leaving -->
  1653 + <xs:enumeration value="2" />
  1654 + <!-- Inside -->
  1655 + <xs:enumeration value="3" />
  1656 + <!-- Outside -->
  1657 + <xs:enumeration value="4" />
  1658 + </xs:restriction>
  1659 + </xs:simpleType>
  1660 +
1628 1661 </xs:schema>
1629 1662  
... ...
... ... @@ -39,15 +39,19 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
39 39 <xs:sequence>
40 40 <!-- Resource Specific Attributes -->
41 41 <xs:element name="locationSource" type="m2m:locationSource" />
  42 + <xs:element name="locationInformationType" type="m2m:locationInformationType" />
42 43 <xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
43 44 <xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
44 45 <xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
45 46 <xs:element name="locationContainerID" type="xs:anyURI" />
46 47 <xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
47 48 <xs:element name="locationStatus" type="xs:string" />
  49 + <xs:element name="geographicalTargetArea" type="xs:anyType" minOccurs="0" />
  50 + <xs:element name="geofenceEventCriteria" type="m2m:geofenceEventCriteria" minOccurs="0" />
48 51 <xs:element name="authID" type="m2m:externalID" minOccurs="0" />
49 52 <xs:element name="retrieveLastKnownLocation" type="xs:boolean" minOccurs="0" />
50 53 <xs:element name="locationUpdateEventCriteria" type="m2m:locationUpdateEventCriteria" minOccurs="0" />
  54 +
51 55  
52 56 <!-- Child Resources -->
53 57 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -71,12 +75,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
71 75 <xs:sequence>
72 76 <!-- Resource Specific Attributes -->
73 77 <xs:element name="locationSource" type="m2m:locationSource" minOccurs="0" />
  78 + <xs:element name="locationInformationType" type="m2m:locationInformationType" minOccurs="0" />
74 79 <xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
75 80 <xs:element name="locationTargetID" type="m2m:locationTargetID" minOccurs="0" />
76 81 <xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
77 82 <xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
78 83 <xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
79 84 <xs:element name="locationStatus" type="xs:string" minOccurs="0" />
  85 + <xs:element name="geographicalTargetArea" type="xs:anyType" minOccurs="0" />
  86 + <xs:element name="geofenceEventCriteria" type="m2m:geofenceEventCriteria" minOccurs="0" />
80 87 <xs:element name="authID" type="m2m:externalID" minOccurs="0" />
81 88 <xs:element name="retrieveLastKnownLocation" type="xs:boolean" minOccurs="0" />
82 89 <xs:element name="locationUpdateEventCriteria" type="m2m:locationUpdateEventCriteria" minOccurs="0" />
... ...
... ... @@ -43,6 +43,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
43 43 <xs:include schemaLocation="CDT-subscription-v3_9_0.xsd" />
44 44 <xs:include schemaLocation="CDT-semanticDescriptor-v3_9_0.xsd" />
45 45 <xs:include schemaLocation="CDT-transaction-v3_9_0.xsd"/>
  46 + <xs:include schemaLocation="CDT-schedule-v3_9_0.xsd"/>
46 47  
47 48 <xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
48 49 <xs:complexType>
... ... @@ -78,6 +79,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
78 79 <xs:element ref="m2m:subscription" />
79 80 <xs:element ref="m2m:semanticDescriptor" />
80 81 <xs:element ref="m2m:transaction" />
  82 + <xs:element ref="m2m:schedule" />
81 83 </xs:choice>
82 84 </xs:choice>
83 85 </xs:sequence>
... ... @@ -119,6 +121,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
119 121 <xs:element ref="m2m:semanticDescriptor" />
120 122 <xs:element ref="m2m:semanticDescriptorAnnc" />
121 123 <xs:element ref="m2m:transaction" />
  124 + <xs:element ref="m2m:schedule" />
122 125 </xs:choice>
123 126 </xs:choice>
124 127 </xs:sequence>
... ...
... ... @@ -55,7 +55,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
55 55 <xs:element name="notificationContentType" type="m2m:notificationContentType" />
56 56 <xs:element name="notificationEventCat" type="m2m:eventCat" minOccurs="0" />
57 57 <xs:element name="subscriberURI" type="xs:anyURI" minOccurs="0" />
58   - <xs:element name="associatedCrossResourceSub" type="m2m:resourceList" minOccurs="0" />
  58 + <xs:element name="associatedCrossResourceSub" type="m2m:listOfURIs" minOccurs="0" />
59 59  
60 60 <!-- Child Resources -->
61 61 <xs:choice minOccurs="0" maxOccurs="1">
... ...
  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_9_0.xsd" />
  31 +
  32 + <xs:element name="triggerPayload">
  33 + <xs:complexType>
  34 + <xs:sequence>
  35 + <!-- Parameter Trigger Purpose -->
  36 + <xs:element name="triggerPurpose" type="m2m:triggerPurpose"/>
  37 + <xs:element name="triggerInfoAddress" type="xs:anyURI" minOccurs="0"/>
  38 + <xs:element name="triggerInfoPoA" type="m2m:poaList" minOccurs="0"/>
  39 + <xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0"/>
  40 + <xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0"/>
  41 + <xs:element name="triggerInfoAE-ID" type="m2m:ID" minOccurs="0"/>
  42 + <xs:element name="triggerInfoSerializationTypes" minOccurs="0">
  43 + <xs:simpleType>
  44 + <xs:restriction>
  45 + <xs:simpleType>
  46 + <xs:list itemType="m2m:serializationType"/>
  47 + </xs:simpleType>
  48 + <xs:minLength value="1"/>
  49 + </xs:restriction>
  50 + </xs:simpleType>
  51 + </xs:element>
  52 + </xs:sequence>
  53 + </xs:complexType>
  54 + </xs:element>
  55 +
  56 +</xs:schema>
  57 +
... ...
... ... @@ -41,9 +41,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
41 41 <xs:element name="M2M-Ext-ID" type="m2m:externalID" />
42 42 <xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientID" />
43 43 <xs:element name="triggerPurpose" type="m2m:triggerPurpose" />
44   - <xs:element name="triggerPayloadSerialization" type="m2m:serializationType" />
45 44 <xs:element name="triggerStatus" type="m2m:triggerStatus" />
46   - <xs:element name="triggerValidityTime" type="m2m:timestamp" minOccurs="0" />
  45 + <xs:element name="triggerValidityTime" type="xs:duration" minOccurs="0" />
47 46 <xs:element name="triggerInfoAE-ID" type="m2m:ID" minOccurs="0" />
48 47 <xs:element name="triggerInfoAddress" type="xs:anyURI" minOccurs="0" />
49 48 <xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0" />
... ...