Commit 19dd2c5254c18140759b5dc86c423ae8e5695c60

Authored by Wolfgang Granzow
1 parent 62b66762

Rel-3 changes agreed at PRO#32

ee PRO-2017-0383 for a detailed description of the changes
... ... @@ -54,6 +54,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
54 54 <xs:element name="requestReachability" type="xs:boolean" />
55 55 <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
56 56 <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
  57 + <xs:element name="M2M-Ext-ID" type="m2m:externalID" minOccurs="0" />
  58 + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
  59 + <xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
  60 + <xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
57 61  
58 62 <!-- Child Resources -->
59 63 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -94,6 +98,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
94 98 <xs:element name="requestReachability" type="xs:boolean" minOccurs="0" />
95 99 <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
96 100 <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
  101 + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
  102 + <xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
  103 + <xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
97 104  
98 105 <!-- Child Resources -->
99 106 <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 +Notice of Disclaimer & Limitation of Liability
  12 +
  13 +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
  14 +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
  15 +No recommendation as to products or vendors is made or should be implied.
  16 +
  17 +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
  18 +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
  19 +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
  20 +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
  21 +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
  22 +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
  23 +
  24 +-->
  25 +
  26 +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
  27 + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  28 + elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  29 +
  30 + <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
  31 + <xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
  32 + <xs:include schemaLocation="CDT-AEContactListPerCSE-v3_5_0.xsd" />
  33 +
  34 +
  35 + <xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
  36 + <xs:complexType>
  37 + <xs:complexContent>
  38 + <!-- Inherit common attributes -->
  39 + <xs:extension base="m2m:regularResource">
  40 + <xs:sequence>
  41 + <!-- Resource Specific Attributes -->
  42 + <xs:element name="numberImpactedCSEs" type="xs:nonNegativeInteger" />
  43 +
  44 + <!-- Child Resources -->
  45 + <xs:choice minOccurs="0" maxOccurs="1">
  46 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  47 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  48 + <xs:element ref="m2m:subscription" />
  49 + <xs:element ref="m2m:AEContactListPerCSE" />
  50 + </xs:choice>
  51 + </xs:choice>
  52 + </xs:sequence>
  53 + </xs:extension>
  54 + </xs:complexContent>
  55 + </xs:complexType>
  56 + </xs:element>
  57 +</xs:schema>
0 58 \ No newline at end of file
... ...
  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 +Notice of Disclaimer & Limitation of Liability
  12 +
  13 +The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand
  14 +and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
  15 +No recommendation as to products or vendors is made or should be implied.
  16 +
  17 +NO REPRESENTATION OR WARRANTY IS MADE THAT THE INFORMATION IS TECHNICALLY ACCURATE OR SUFFICIENT OR CONFORMS TO ANY STATUTE,
  18 +GOVERNMENTAL RULE OR REGULATION, AND FURTHER, NO REPRESENTATION OR WARRANTY IS MADE OF MERCHANTABILITY OR FITNESS FOR ANY
  19 +PARTICULAR PURPOSE OR AGAINST INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS.
  20 +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
  21 +ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCIDENTAL OR CONSEQUENTIAL DAMAGES.
  22 +oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
  23 +
  24 +-->
  25 +
  26 +<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
  27 + xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  28 + elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
  29 +
  30 + <xs:include schemaLocation="CDT-commonTypes-v3_5_0.xsd" />
  31 +
  32 + <xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
  33 + <xs:complexType>
  34 + <xs:complexContent>
  35 + <!-- Inherit common attributes -->
  36 + <xs:extension base="m2m:regularResource">
  37 + <xs:sequence>
  38 + <!-- Resource Specific Attributes -->
  39 + <xs:element name="CSE-ID" type="xs:nonNegativeInteger" />
  40 + <xs:element name="AE-IDList" type="m2m:listOfM2MID" minOccurs="0"/>
  41 +
  42 + <!-- This resource type has no child Resources -->
  43 +
  44 + </xs:sequence>
  45 + </xs:extension>
  46 + </xs:complexContent>
  47 + </xs:complexType>
  48 + </xs:element>
  49 +</xs:schema>
0 50 \ No newline at end of file
... ...
... ... @@ -52,6 +52,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
52 52 <xs:include schemaLocation="CDT-ontologyRepository-v3_5_0.xsd" />
53 53 <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_5_0.xsd" />
54 54 <xs:include schemaLocation="CDT-semanticMashupInstance-v3_5_0.xsd" />
  55 + <xs:include schemaLocation="CDT-AEContactList-v3_5_0.xsd" />
55 56  
56 57 <xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
57 58 <xs:complexType>
... ... @@ -73,7 +74,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
73 74 <xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />
74 75 <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
75 76 <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
76   -
  77 + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
  78 +
77 79 <!-- Child Resources -->
78 80 <xs:choice minOccurs="0" maxOccurs="1">
79 81 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
... ... @@ -103,7 +105,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
103 105 <xs:element ref="m2m:authorizationInformation" />
104 106 <xs:element ref="m2m:ontologyRepository" />
105 107 <xs:element ref="m2m:semanticMashupJobProfile" />
106   - <xs:element ref="m2m:semanticMashupInstance" />
  108 + <xs:element ref="m2m:semanticMashupInstance" />
  109 + <xs:element ref="m2m:AEContactList" />
107 110 </xs:choice>
108 111 </xs:choice>
109 112 </xs:sequence>
... ...
... ... @@ -290,6 +290,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
290 290 </xs:restriction>
291 291 </xs:simpleType>
292 292  
  293 + <xs:simpleType name="mediaType">
  294 + <xs:restriction base="xs:string">
  295 + <xs:pattern value="[\w/!#$^_\.+&amp;\-;=]+" />
  296 + </xs:restriction>
  297 + </xs:simpleType>
  298 +
  299 + <xs:simpleType name="protocolList">
  300 + <xs:restriction>
  301 + <xs:simpleType>
  302 + <xs:list itemType="m2m:mediaType" />
  303 + </xs:simpleType>
  304 + <xs:minLength value="1" />
  305 + </xs:restriction>
  306 + </xs:simpleType>
  307 +
293 308 <xs:simpleType name="eventCat">
294 309 <union>
295 310 <simpleType>
... ... @@ -424,7 +439,44 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
424 439 </xs:simpleType>
425 440 </xs:union>
426 441 </xs:simpleType>
  442 +
  443 + <xs:simpleType name="releaseVersion">
  444 + <xs:restriction base="xs:string" >
  445 + <xs:pattern value="2a"/>
  446 + <xs:pattern value="3"/>
  447 + </xs:restriction>
  448 + </xs:simpleType>
  449 +
  450 + <xs:simpleType name="applicableReleaseVersion">
  451 + <xs:restriction base="xs:string" >
  452 + <xs:pattern value="1"/>
  453 + <xs:pattern value="2"/>
  454 + <xs:pattern value="2a"/>
  455 + <xs:pattern value="3"/>
  456 + </xs:restriction>
  457 + </xs:simpleType>
427 458  
  459 + <xs:simpleType name="supportedReleaseVersions">
  460 + <xs:restriction>
  461 + <xs:simpleType>
  462 + <xs:list itemType="m2m:applicableReleaseVersion" />
  463 + </xs:simpleType>
  464 + <xs:minLength value="1" />
  465 + </xs:restriction>
  466 + </xs:simpleType>
  467 +
  468 + <xs:simpleType name="mashupMember">
  469 + <xs:union>
  470 + <xs:simpleType>
  471 + <xs:restriction base='xs:base64Binary' />
  472 + </xs:simpleType>
  473 + <xs:simpleType>
  474 + <xs:restriction base='m2m:listOfURIs' />
  475 + </xs:simpleType>
  476 + </xs:union>
  477 + </xs:simpleType>
  478 +
  479 +
428 480 <!--********************** -->
429 481 <!-- oneM2M Complex Types -->
430 482 <!--********************** -->
... ... @@ -517,10 +569,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
517 569 <xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0"/>
518 570 <xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/>
519 571 <xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/>
  572 + <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
520 573 </xs:sequence>
521 574 </xs:complexType>
522 575  
523   -<!-- primitiveContent defined in CDT-reqestPrimitive and CDT-responsePrimitive ??? -->
  576 + <!-- primitiveContent used in CDT-reqestPrimitive and CDT-responsePrimitive -->
524 577 <xs:complexType name="primitiveContent">
525 578 <xs:choice minOccurs="0" >
526 579 <xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" />
... ...
... ... @@ -54,7 +54,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
54 54 <xs:element name="systemTime" type="m2m:timestamp" minOccurs="0"/>
55 55 <xs:element name="supportURL" type="xs:anyURI" minOccurs="0"/>
56 56 <xs:element name="presentationURL" type="xs:anyURI" minOccurs="0"/>
57   - <!-- protocol attribute (multiplicity 0..1(L) ) defined in TS-0001v3_8_0 is missing -->
  57 + <xs:element name="protocol" type="m2m:protocolList" minOccurs="0"/>
58 58  
59 59 <!-- Child Resources -->
60 60 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -91,7 +91,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
91 91 <xs:element name="systemTime" type="m2m:timestamp" minOccurs="0"/>
92 92 <xs:element name="supportURL" type="xs:anyURI" minOccurs="0"/>
93 93 <xs:element name="presentationURL" type="xs:anyURI" minOccurs="0"/>
94   - <!-- protocol attribute (multiplicity 0..1(L) ) defined in TS-0001v3_8_0 is missing -->
  94 + <xs:element name="protocol" type="m2m:protocolList" minOccurs="0"/>
95 95  
96 96 <!-- Child Resources -->
97 97 <xs:choice minOccurs="0" maxOccurs="1">
... ...
... ... @@ -116,6 +116,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
116 116 <xs:enumeration value="41" />
117 117 <!-- semanticMashupResult -->
118 118 <xs:enumeration value="42" />
  119 + <!-- AEContactList -->
  120 + <xs:enumeration value="43" />
  121 + <!-- AEContactListPerCSE -->
  122 + <xs:enumeration value="44" />
119 123 <!-- accessControlPolicyAnnc -->
120 124 <xs:enumeration value="10001" />
121 125 <!-- AEAnnc -->
... ... @@ -155,7 +159,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
155 159 <!-- semanticMashupJobProfileAnnc -->
156 160 <xs:enumeration value="10040" />
157 161 <!-- semanticMashupInstanceAnnc -->
158   - <xs:enumeration value="10041" />
  162 + <xs:enumeration value="10041" />
  163 + <!-- semanticMashupResultAnnc -->
  164 + <xs:enumeration value="10042" />
159 165 </xs:restriction>
160 166 </xs:simpleType>
161 167  
... ... @@ -300,7 +306,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
300 306 <!-- UPDATED -->
301 307 <xs:enumeration value="2004" />
302 308 <!-- BAD_REQUEST -->
303   - <xs:enumeration value="4000" />
  309 + <xs:enumeration value="4000" />
  310 + <!-- RELEASE_VERSION_NOT_SUPPORTE -->
  311 + <xs:enumeration value="4001" />
304 312 <!-- NOT_FOUND -->
305 313 <xs:enumeration value="4004" />
306 314 <!-- OPERATION_NOT_ALLOWED -->
... ... @@ -515,6 +523,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
515 523 <xs:enumeration value="41" />
516 524 <!-- semanticMashupResult -->
517 525 <xs:enumeration value="42" />
  526 + <!-- AEContactList -->
  527 + <xs:enumeration value="43" />
  528 + <!-- AEContactListPerCSE -->
  529 + <xs:enumeration value="44" />
518 530 <!-- accessControlPolicyAnnc -->
519 531 <xs:enumeration value="10001" />
520 532 <!-- AEAnnc -->
... ... @@ -555,6 +567,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
555 567 <xs:enumeration value="10040" />
556 568 <!-- semanticMashupInstanceAnnc -->
557 569 <xs:enumeration value="10041" />
  570 + <!-- semanticMashupResultAnnc -->
  571 + <xs:enumeration value="10042" />
558 572 <!-- oldest -->
559 573 <xs:enumeration value="20001" />
560 574 <!-- latest -->
... ... @@ -1387,6 +1401,30 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
1387 1401 <xs:enumeration value="4" />
1388 1402 </xs:restriction>
1389 1403 </xs:simpleType>
  1404 +
  1405 + <xs:simpleType name="locationUpdateEventCriteria">
  1406 + <xs:annotation>
  1407 + <xs:documentation>Used for locationUpdateEventCriteria attribute of locationPolicy resource</xs:documentation>
  1408 + </xs:annotation>
  1409 + <xs:restriction base="xs:integer">
  1410 + <!-- Location_Change -->
  1411 + <xs:enumeration value="0" />
  1412 + </xs:restriction>
  1413 + </xs:simpleType>
  1414 +
  1415 +
  1416 + <xs:simpleType name="AERegistrationStatus">
  1417 + <xs:annotation>
  1418 + <xs:documentation>Used for registrationStatus attribute in AE resource</xs:documentation>
  1419 + </xs:annotation>
  1420 + <xs:restriction base="xs:integer">
  1421 + <!-- ACTIVE -->
  1422 + <xs:enumeration value="1" />
  1423 + <!-- INACTIVE -->
  1424 + <xs:enumeration value="2" />
  1425 + </xs:restriction>
  1426 + </xs:simpleType>
  1427 +
1390 1428  
1391 1429 </xs:schema>
1392 1430  
... ...
... ... @@ -44,7 +44,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
44 44 <xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
45 45 <xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
46 46 <xs:element name="locationStatus" type="xs:string" />
47   - <xs:element name="authID" type="m2m:externalID" minOccurs="0" />
  47 + <xs:element name="authID" type="m2m:externalID" minOccurs="0" />
  48 + <xs:element name="retrieveLastKnownLocation" type="xs:boolean" minOccurs="0" />
  49 + <xs:element name="locationUpdateEventCriteria" type="m2m:locationUpdateEventCriteria" minOccurs="0" />
48 50  
49 51 <!-- Child Resources -->
50 52 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -74,6 +76,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
74 76 <xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
75 77 <xs:element name="locationStatus" type="xs:string" minOccurs="0" />
76 78 <xs:element name="authID" type="m2m:externalID" minOccurs="0" />
  79 + <xs:element name="retrieveLastKnownLocation" type="xs:boolean" minOccurs="0" />
  80 + <xs:element name="locationUpdateEventCriteria" type="m2m:locationUpdateEventCriteria" minOccurs="0" />
77 81  
78 82 <!-- No Child Resources -->
79 83 </xs:sequence>
... ...
... ... @@ -43,7 +43,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
43 43 <xs:element name="notificationEvent" minOccurs="0">
44 44 <xs:complexType >
45 45 <xs:sequence>
46   - <xs:element name="representation" type="xs:anyType" minOccurs="0"/>
  46 + <xs:element name="representation" type="m2m:representation" minOccurs="0"/>
47 47 <xs:element name="operationMonitor" minOccurs="0">
48 48 <xs:complexType>
49 49 <xs:sequence>
... ... @@ -56,19 +56,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
56 56 </xs:sequence>
57 57 </xs:complexType>
58 58 </xs:element>
59   - <xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/>
60   - <xs:element name="subscriptionDeletion" type="xs:boolean" minOccurs="0"/>
61   - <xs:element name="subscriptionReference" type="xs:anyURI" minOccurs="0"/>
62   - <xs:element name="creator" type="m2m:ID" minOccurs="0"/>
63   - <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/>
64   - <xs:element name="IPEDiscoveryRequest" minOccurs="0">
  59 + <xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/>
  60 + <xs:element name="subscriptionDeletion" type="xs:boolean" minOccurs="0"/>
  61 + <xs:element name="subscriptionReference" type="xs:anyURI" minOccurs="0"/>
  62 + <xs:element name="creator" type="m2m:ID" minOccurs="0"/>
  63 + <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/>
  64 + <xs:element name="notificationTarget" type="m2m:ID" minOccurs="0"/>
  65 + <xs:element name="targetRemovalRequest" type="xs:boolean" minOccurs="0"/>
  66 + <xs:element name="targetRemovalAllowance" type="xs:boolean" minOccurs="0"/>
  67 + <xs:element name="IPEDiscoveryRequest" minOccurs="0">
65 68 <xs:complexType >
66 69 <xs:sequence>
67 70 <xs:element name="originator" type="m2m:ID" />
68 71 <xs:element name="filterCriteria" type="m2m:filterCriteria" />
69 72 </xs:sequence>
70 73 </xs:complexType>
71   - </xs:element>
  74 + </xs:element>
  75 + <xs:element name="AERegistrationPointChange" type="xs:boolean" minOccurs="0"/>
  76 + <xs:element name="AEReferenceIDChange" type="xs:boolean" minOccurs="0"/>
  77 + <xs:element name="trackingID1" type="m2m:ID" minOccurs="1"/>
  78 + <xs:element name="trackingID2" type="m2m:ID" minOccurs="1"/>
  79 +
72 80 </xs:sequence>
73 81 </xs:complexType>
74 82  
... ... @@ -132,5 +140,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
132 140 <xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" />
133 141 </xs:sequence>
134 142 </xs:complexType>
  143 +
  144 + <xs:complexType name="representation">
  145 + <xs:choice minOccurs="0" >
  146 + <xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" />
  147 + <xs:any namespace="##other" processContents="lax" />
  148 + </xs:choice>
  149 + </xs:complexType>
135 150  
136 151 </xs:schema>
... ...
... ... @@ -43,7 +43,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
43 43 <xs:element name="description" type="xs:string" minOccurs="0" />
44 44 <xs:element name="ontologyFormat" type="m2m:ontologyFormat" />
45 45 <xs:element name="ontologyContent" type="xs:anySimpleType" />
46   -
  46 + <xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
  47 +
47 48 <!-- Child Resources -->
48 49 <xs:choice minOccurs="0" maxOccurs="1">
49 50 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
... ... @@ -68,6 +69,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
68 69 <xs:element name="description" type="xs:string" minOccurs="0" />
69 70 <xs:element name="ontologyFormat" type="m2m:ontologyFormat" minOccurs="0" />
70 71 <xs:element name="ontologyContent" type="xs:anySimpleType" minOccurs="0" />
  72 + <xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
71 73  
72 74 <!-- Child Resources -->
73 75 <xs:choice minOccurs="0" maxOccurs="1">
... ...
... ... @@ -62,6 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
62 62 <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
63 63 <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
64 64 <xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" />
  65 + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
65 66  
66 67 <!-- Child Resources -->
67 68 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -112,6 +113,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
112 113 <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
113 114 <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
114 115 <xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" />
  116 + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
115 117  
116 118 <!-- Child Resources -->
117 119 <xs:choice minOccurs="0" maxOccurs="1">
... ...
... ... @@ -126,6 +126,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
126 126 <xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/>
127 127 <!-- parameter " Semantic Query Indicator" -->
128 128 <xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/>
  129 + <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
129 130 </xs:sequence>
130 131 </xs:complexType>
131 132 </xs:element>
... ...
... ... @@ -109,6 +109,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
109 109 <xs:element name="tokenRequestInformation" type="m2m:dynAuthTokenReqInfo" minOccurs="0" />
110 110 <!-- parameter "Authorization Signature Request Information -->
111 111 <xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" />
  112 + <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
112 113 </xs:sequence>
113 114 </xs:complexType>
114 115 </xs:element>
... ...
... ... @@ -45,9 +45,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
45 45 <xs:element name="smjpID" type="xs:anyURI" />
46 46 <xs:element name="smjpInputParameter" type="xs:base64Binary" />
47 47 <xs:element name="memberStoreType" type="m2m:mashupMemberStoreType" />
48   - <xs:element name="mashupMember" type="xs:base64Binary" />
  48 + <xs:element name="mashupMember" type="m2m:mashupMember" minOccurs="0"/>
49 49 <xs:element name="resultGenType" type="m2m:mashupResultGenType" />
50 50 <xs:element name="periodForResultGen" type="xs:duration" minOccurs="0" />
  51 +
51 52  
52 53 <!-- Child Resources -->
53 54 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -71,23 +72,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
71 72 <xs:extension base="m2m:announcedResource">
72 73 <xs:sequence>
73 74 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
74   - <xs:element name="stateTag" type="xs:nonNegativeInteger" />
  75 + <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0"/>
75 76 <!-- Resource Specific Attributes -->
76   - <xs:element name="memberFilter" type="m2m:sparql" minOccurs="0" />
77   - <xs:element name="smiID" type="m2m:listOfURIs" minOccurs="0" />
78   - <xs:element name="inputDescriptor" type="xs:base64Binary" minOccurs="0" />
79   - <xs:element name="outputDescriptor" type="xs:base64Binary" minOccurs="0" />
80   - <xs:element name="functionDescriptor" type="xs:base64Binary" minOccurs="0" />
81   -
  77 + <xs:element name="smjpID" type="xs:anyURI" minOccurs="0"/>
  78 + <xs:element name="smjpInputParameter" type="xs:base64Binary" minOccurs="0"/>
  79 + <xs:element name="memberStoreType" type="m2m:mashupMemberStoreType" minOccurs="0"/>
  80 + <xs:element name="mashupMember" type="m2m:mashupMember" minOccurs="0"/>
  81 + <xs:element name="resultGenType" type="m2m:mashupResultGenType" minOccurs="0"/>
  82 + <xs:element name="periodForResultGen" type="xs:duration" minOccurs="0" />
  83 +
82 84 <!-- Child Resources -->
83 85 <xs:choice minOccurs="0" maxOccurs="1">
84 86 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
85 87 <xs:choice minOccurs="1" maxOccurs="unbounded">
86 88 <xs:element ref="m2m:subscription" />
87 89 <xs:element ref="m2m:semanticMashupResult" />
88   - <!-- conflict between TS-0001 and TS-0004:
89   - semanticMashupResultAnnc defined as not announceable in TS-0004-->
90   - <!-- <xs:element ref="m2m:semanticMashupResultAnnc" /> -->
  90 + <xs:element ref="m2m:semanticMashupResultAnnc" />
91 91 <xs:element ref="m2m:semanticDescriptor" />
92 92 <xs:element ref="m2m:semanticDescriptorAnnc" />
93 93  
... ...
... ... @@ -69,7 +69,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
69 69 <xs:extension base="m2m:announcedResource">
70 70 <xs:sequence>
71 71 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
72   - <xs:element name="stateTag" type="xs:nonNegativeInteger" />
  72 + <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0"/>
73 73 <!-- Resource Specific Attributes -->
74 74 <xs:element name="memberFilter" type="m2m:sparql" minOccurs="0" />
75 75 <xs:element name="smiID" type="m2m:listOfURIs" minOccurs="0" />
... ...
... ... @@ -34,6 +34,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
34 34 <xs:complexContent>
35 35 <xs:extension base="m2m:regularResource">
36 36 <xs:sequence>
  37 + <!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>,
  38 + <ontology>, and other resources -->
  39 + <xs:element name="stateTag" type="xs:nonNegativeInteger" />
  40 + <xs:element name="creator" type="m2m:ID" minOccurs="0" />
37 41 <!-- Resource Specific Attributes -->
38 42 <xs:element name="smjpInputParameter" type="xs:base64Binary" minOccurs="0"/>
39 43 <xs:element name="mashupResultFormat" type="m2m:serializations" />
... ... @@ -52,4 +56,32 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
52 56 </xs:complexContent>
53 57 </xs:complexType>
54 58 </xs:element>
  59 +
  60 + <xs:element name="semanticMashupResultAnnc" substitutionGroup="m2m:sg_regularResource">
  61 + <xs:complexType>
  62 + <xs:complexContent>
  63 + <xs:extension base="m2m:regularResource">
  64 + <xs:sequence>
  65 + <!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>,
  66 + <ontology>, and other resources -->
  67 + <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0"/>
  68 + <!-- Resource Specific Attributes -->
  69 + <xs:element name="smjpInputParameter" type="xs:base64Binary" minOccurs="0"/>
  70 + <xs:element name="mashupResultFormat" type="m2m:serializations" minOccurs="0"/>
  71 + <xs:element name="mashupResult" type="xs:base64Binary" minOccurs="0"/>
  72 +
  73 + <!-- Child Resources -->
  74 + <xs:choice minOccurs="0" maxOccurs="1">
  75 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  76 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  77 + <xs:element ref="m2m:subscription" />
  78 + <xs:element ref="m2m:semanticDescriptor" />
  79 + <xs:element ref="m2m:semanticDescriptorAnnc" />
  80 + </xs:choice>
  81 + </xs:choice>
  82 + </xs:sequence>
  83 + </xs:extension>
  84 + </xs:complexContent>
  85 + </xs:complexType>
  86 + </xs:element>
55 87 </xs:schema>
56 88 \ No newline at end of file
... ...
... ... @@ -107,8 +107,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
107 107  
108 108 <xs:complexType name="batchNotify">
109 109 <xs:sequence>
110   - <xs:element name="number" type="xs:nonNegativeInteger" />
111   - <xs:element name="duration" type="xs:duration" />
  110 + <xs:element name="number" type="xs:nonNegativeInteger" minOccurs="0" />
  111 + <xs:element name="duration" type="xs:duration" minOccurs="0" />
112 112 </xs:sequence>
113 113 </xs:complexType>
114 114  
... ...
... ... @@ -53,7 +53,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
53 53 <xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
54 54 <xs:element name="missingDataDetectTimer" type="xs:nonNegativeInteger" minOccurs="0" />
55 55 <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
56   -
  56 + <xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
  57 +
57 58 <xs:choice minOccurs="0" maxOccurs="1">
58 59 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
59 60 <xs:choice minOccurs="1" maxOccurs="unbounded">
... ... @@ -87,6 +88,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
87 88 <xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
88 89 <xs:element name="missingDataDetectTimer" type="xs:nonNegativeInteger" minOccurs="0" />
89 90 <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
  91 + <xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
90 92  
91 93 <!-- Child Resources -->
92 94 <xs:choice minOccurs="0" maxOccurs="1">
... ...