Commit ce5456c691d59378a7fb1644e334e61994a44891

Authored by Wolfgang Granzow
1 parent 8526468d

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

See dedailed list of changes in PRO-2018.0066
... ... @@ -37,6 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
37 37 <xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
38 38 <xs:include schemaLocation="CDT-trafficPattern-v3_6_0.xsd" />
39 39 <xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
  40 + <xs:include schemaLocation="CDT-multimediaSession-v3_6_0.xsd" />
40 41  
41 42 <xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
42 43 <xs:complexType>
... ... @@ -58,6 +59,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
58 59 <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
59 60 <xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
60 61 <xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
  62 + <xs:element name="sessionCapabilities" type="m2m:sessionCapabilities" minOccurs="0" />
61 63  
62 64 <!-- Child Resources -->
63 65 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -74,6 +76,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
74 76 <xs:element ref="m2m:trafficPattern" />
75 77 <xs:element ref="m2m:sg_flexContainerResource" />
76 78 <xs:element ref="m2m:semanticMashupInstance" />
  79 + <xs:element ref="m2m:multimediaSession" />
77 80 </xs:choice>
78 81 </xs:choice>
79 82 </xs:sequence>
... ... @@ -101,6 +104,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
101 104 <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
102 105 <xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
103 106 <xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
  107 + <xs:element name="sessionCapabilities" type="m2m:sessionCapabilities" minOccurs="0" />
104 108  
105 109 <!-- Child Resources -->
106 110 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -122,6 +126,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
122 126 <xs:element ref="m2m:sg_announcedFlexContainerResource" />
123 127 <xs:element ref="m2m:semanticMashupInstance" />
124 128 <xs:element ref="m2m:semanticMashupInstanceAnnc" />
  129 + <xs:element ref="m2m:multimediaSession" />
  130 + <xs:element ref="m2m:multimediaSessionAnnc" />
125 131 </xs:choice>
126 132 </xs:choice>
127 133 </xs:sequence>
... ...
... ... @@ -53,6 +53,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
53 53 <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_6_0.xsd" />
54 54 <xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
55 55 <xs:include schemaLocation="CDT-AEContactList-v3_6_0.xsd" />
  56 + <xs:include schemaLocation="CDT-localMulticastGroup-v3_6_0.xsd" />
56 57  
57 58 <xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
58 59 <xs:complexType>
... ... @@ -107,6 +108,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
107 108 <xs:element ref="m2m:semanticMashupJobProfile" />
108 109 <xs:element ref="m2m:semanticMashupInstance" />
109 110 <xs:element ref="m2m:AEContactList" />
  111 + <xs:element ref="m2m:localMulticastGroup" />
110 112 </xs:choice>
111 113 </xs:choice>
112 114 </xs:sequence>
... ...
... ... @@ -194,11 +194,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
194 194 </xs:restriction>
195 195 </xs:simpleType>
196 196  
  197 + <xs:simpleType name="pointOfAccess">
  198 + <xs:restriction base="xs:anyURI">
  199 + <xs:pattern value="(http|HTTP|coap|COAP|mqtt|MQTT|ws|WS)(s|S)?://[\w/!#$^_\.+&amp;\-:;=]+" />
  200 + </xs:restriction>
  201 + </xs:simpleType>
197 202  
198 203 <xs:simpleType name="poaList">
199 204 <xs:restriction>
200 205 <xs:simpleType>
201   - <xs:list itemType="xs:string" />
  206 + <xs:list itemType="m2m:pointOfAccess" />
202 207 </xs:simpleType>
203 208 <xs:minLength value="1" />
204 209 </xs:restriction>
... ... @@ -369,11 +374,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
369 374 </xs:simpleType>
370 375  
371 376 <xs:simpleType name="listOfDuration">
372   - <list itemType="xs:duration" />
  377 + <xs:restriction>
  378 + <xs:simpleType>
  379 + <xs:list itemType="xs:duration" />
  380 + </xs:simpleType>
  381 + <xs:minLength value="1" />
  382 + </xs:restriction>
373 383 </xs:simpleType>
374 384  
375 385 <xs:simpleType name="attributeList">
376   - <list itemType="xs:NCName" />
  386 + <xs:restriction>
  387 + <xs:simpleType>
  388 + <xs:list itemType="xs:NCName" />
  389 + </xs:simpleType>
  390 + <xs:minLength value="1" />
  391 + </xs:restriction>
377 392 </xs:simpleType>
378 393  
379 394 <xs:simpleType name="resourceTypeList">
... ... @@ -475,6 +490,25 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
475 490 </xs:simpleType>
476 491 </xs:union>
477 492 </xs:simpleType>
  493 +
  494 + <xs:simpleType name="TMGI">
  495 + <xs:restriction base="xs:string" >
  496 + <xs:pattern value="([a-fA-F0-9]{6})[\d]{5}[\d]?" />
  497 + </xs:restriction>
  498 + </xs:simpleType>
  499 +
  500 + <xs:simpleType name="sessionDescription">
  501 + <xs:restriction base="xs:string" />
  502 + </xs:simpleType>
  503 +
  504 + <xs:simpleType name="sessionCapabilities">
  505 + <xs:restriction>
  506 + <xs:simpleType>
  507 + <xs:list itemType="m2m:mediaType" />
  508 + </xs:simpleType>
  509 + <xs:minLength value="1" />
  510 + </xs:restriction>
  511 + </xs:simpleType>
478 512  
479 513  
480 514 <!--********************** -->
... ... @@ -570,6 +604,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
570 604 <xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/>
571 605 <xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/>
572 606 <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
  607 + <xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
573 608 </xs:sequence>
574 609 </xs:complexType>
575 610  
... ... @@ -1183,7 +1218,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
1183 1218 <!-- the URL of the container/flexContainer resource for the Input/OutputDataPoint or OperationIn-/Output -->
1184 1219 <xs:element name="dataContainerID" type="m2m:ID" />
1185 1220  
1186   - <!-- if the dataLink references simpe type data the element shall contain -->
  1221 + <!-- if the dataLink references simple type data the element shall contain -->
1187 1222 <!-- a) the name of the customAttribute if URL points to a flexContainer or -->
1188 1223 <!-- b) the string "latest" if URL points to a container -->
1189 1224 <!-- if the dataLink references complex-type data (i.e. the complete resource -->
... ... @@ -1262,6 +1297,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
1262 1297 <xs:element name="privileges" type="m2m:setOfAcrs" minOccurs="0" maxOccurs="unbounded"/>
1263 1298 </xs:sequence>
1264 1299 </xs:complexType>
  1300 +
  1301 + <xs:complexType name="sessionDescriptions">
  1302 + <xs:sequence>
  1303 + <xs:element name="sessionDescription" type="m2m:sessionDescription" minOccurs="1" maxOccurs="unbounded"/>
  1304 + </xs:sequence>
  1305 + </xs:complexType>
  1306 +
1265 1307  
1266 1308 <!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources. Each oneM2M
1267 1309 Resource has a resource type that is defined in a separate schema, but each resource type extends one of the types that is
... ...
... ... @@ -30,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 30 <xs:include schemaLocation="CDT-contentInstance-v3_6_0.xsd" />
31 31 <xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
32 32 <xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
  33 + <xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
33 34  
34 35  
35 36 <xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
... ... @@ -58,7 +59,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
58 59 <xs:element ref="m2m:container" />
59 60 <xs:element ref="m2m:subscription" />
60 61 <xs:element ref="m2m:semanticDescriptor" />
61   - <xs:element ref="m2m:sg_flexContainerResource" />
  62 + <xs:element ref="m2m:sg_flexContainerResource" />
  63 + <xs:element ref="m2m:timeSeries" />
62 64 </xs:choice>
63 65 </xs:choice>
64 66 </xs:sequence>
... ... @@ -97,6 +99,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
97 99 <xs:element ref="m2m:semanticDescriptorAnnc" />
98 100 <xs:element ref="m2m:sg_flexContainerResource" />
99 101 <xs:element ref="m2m:sg_announcedFlexContainerResource" />
  102 + <xs:element ref="m2m:timeSeries" />
  103 + <xs:element ref="m2m:timeSeriesAnnc" />
100 104 </xs:choice>
101 105 </xs:choice>
102 106 </xs:sequence>
... ...
... ... @@ -119,7 +119,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
119 119 <!-- AEContactList -->
120 120 <xs:enumeration value="43" />
121 121 <!-- AEContactListPerCSE -->
122   - <xs:enumeration value="44" />
  122 + <xs:enumeration value="44" />
  123 + <!-- localMulticastGroup -->
  124 + <xs:enumeration value="45" />
  125 + <!-- multimediaSession -->
  126 + <xs:enumeration value="46" />
123 127 <!-- accessControlPolicyAnnc -->
124 128 <xs:enumeration value="10001" />
125 129 <!-- AEAnnc -->
... ... @@ -383,8 +387,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
383 387 <xs:enumeration value="5210" />
384 388 <!-- ESPRIM_ENCRYPTION_ERROR -->
385 389 <xs:enumeration value="5211" />
386   - <!-- ESPRIM_ENCRYPTION_ERROR -->
387   - <xs:enumeration value="5212" />
  390 + <!-- SPARQL_UPDATE_ERROR -->
  391 + <xs:enumeration value="5212" />
  392 + <!-- MASH_UP_OPERATION_FAILED -->
  393 + <xs:enumeration value="5213" />
  394 + <!-- TARGET_HAS_NO_SESSION_CAPABILITY -->
  395 + <xs:enumeration value="5214" />
  396 + <!-- SESSION_IS_ONLINE -->
  397 + <xs:enumeration value="5215" />
  398 + <!-- JOIN_MULTICAST_GROUP_FAILED -->
  399 + <xs:enumeration value="5216" />
  400 + <!-- LEAVE_MULTICAST_GROUP_FAILED -->
  401 + <xs:enumeration value="5217" />
388 402 <!-- SPARQL_UPDATE_ERROR -->
389 403 <xs:enumeration value="6003" />
390 404 <!-- EXTERNAL_OBJECT_NOT_FOUND -->
... ... @@ -526,7 +540,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
526 540 <!-- AEContactList -->
527 541 <xs:enumeration value="43" />
528 542 <!-- AEContactListPerCSE -->
529   - <xs:enumeration value="44" />
  543 + <xs:enumeration value="44" />
  544 + <!-- multimediaSession -->
  545 + <xs:enumeration value="46" />
530 546 <!-- accessControlPolicyAnnc -->
531 547 <xs:enumeration value="10001" />
532 548 <!-- AEAnnc -->
... ... @@ -569,6 +585,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
569 585 <xs:enumeration value="10041" />
570 586 <!-- semanticMashupResultAnnc -->
571 587 <xs:enumeration value="10042" />
  588 + <!-- multimediaSessionAnnc -->
  589 + <xs:enumeration value="10046" />
572 590 <!-- oldest -->
573 591 <xs:enumeration value="20001" />
574 592 <!-- latest -->
... ... @@ -849,8 +867,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
849 867 <xs:enumeration value="1018" />
850 868 <!-- cmdhBuffer -->
851 869 <xs:enumeration value="1019" />
852   -
853   -
  870 + <!-- registration -->
  871 + <xs:enumeration value="1020" />
  872 + <!-- dataCollection -->
  873 + <xs:enumeration value="1021" />
  874 + <!-- authenticationProfile -->
  875 + <xs:enumeration value="1022" />
  876 + <!-- myCertFileCred -->
  877 + <xs:enumeration value="1023" />
  878 + <!-- trustAnchorCred -->
  879 + <xs:enumeration value="1024" />
  880 + <!-- MAFClientRegCfg -->
  881 + <xs:enumeration value="1025" />
  882 + <!-- MEFClientRegCfg -->
  883 + <xs:enumeration value="1026" />
854 884 </xs:restriction>
855 885 </xs:simpleType>
856 886  
... ... @@ -1408,7 +1438,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
1408 1438 </xs:annotation>
1409 1439 <xs:restriction base="xs:integer">
1410 1440 <!-- Location_Change -->
1411   - <xs:enumeration value="0" />
  1441 + <xs:enumeration value="1" />
1412 1442 </xs:restriction>
1413 1443 </xs:simpleType>
1414 1444  
... ... @@ -1425,6 +1455,30 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
1425 1455 </xs:restriction>
1426 1456 </xs:simpleType>
1427 1457  
  1458 + <xs:simpleType name="multicastCapability">
  1459 + <xs:annotation>
  1460 + <xs:documentation>Used for multicastCapability attribute in remoteCSE resource and multicastType element in Multicast Group Information Data Object</xs:documentation>
  1461 + </xs:annotation>
  1462 + <xs:restriction base="xs:integer">
  1463 + <!-- MBMS -->
  1464 + <xs:enumeration value="1" />
  1465 + <!-- IP -->
  1466 + <xs:enumeration value="2" />
  1467 + </xs:restriction>
  1468 + </xs:simpleType>
  1469 +
  1470 +
  1471 + <xs:simpleType name="sessionState">
  1472 + <xs:annotation>
  1473 + <xs:documentation>Used for sessionState attribute of multimediaSession resource</xs:documentation>
  1474 + </xs:annotation>
  1475 + <xs:restriction base="xs:integer">
  1476 + <!-- OFFLINE -->
  1477 + <xs:enumeration value="1" />
  1478 + <!-- ONLINE -->
  1479 + <xs:enumeration value="2" />
  1480 + </xs:restriction>
  1481 + </xs:simpleType>
1428 1482  
1429 1483 </xs:schema>
1430 1484  
... ...
... ... @@ -43,7 +43,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
43 43 <xs:element name="memberType" type="m2m:memberType" />
44 44 <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" />
45 45 <xs:element name="maxNrOfMembers" type="xs:positiveInteger" />
46   - <xs:element name="memberIDs" type="m2m:listOfURIs" />
  46 + <xs:element name="memberIDs">
  47 + <xs:simpleType>
  48 + <xs:list itemType="xs:anyURI"/>
  49 + </xs:simpleType>
  50 + </xs:element>
47 51 <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
48 52 <xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0"/>
49 53 <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
... ...
  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_6_0.xsd" />
  31 +
  32 + <!-- resource typ e not implemented yet: -->
  33 + <!-- <xs:include schemaLocation="CDT-transaction-v3_6_0.xsd" /> -->
  34 +
  35 +
  36 + <xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
  37 + <xs:complexType>
  38 + <xs:complexContent>
  39 + <!-- Inherit common attributes -->
  40 + <xs:extension base="m2m:regularResource">
  41 + <xs:sequence>
  42 + <!-- Resource Specific Attributes -->
  43 + <xs:element name="externalGroupID" type="m2m:externalID" minOccurs="0" />
  44 + <xs:element name="multicastAddress" type="m2m:ipAddress" />
  45 + <xs:element name="multicastGroupFanoutTarget" type="xs:anyURI" />
  46 + <xs:element name="memberList" type="m2m:listOfURIs" />
  47 + <xs:element name="responseTarget" type="xs:anyURI" />
  48 + <xs:element name="responseTimeWindow" type="xs:duration" minOccurs="0" />
  49 + <xs:element name="TMGI" type="m2m:TMGI" minOccurs="0" />
  50 +
  51 + <!-- Child Resources -->
  52 + <xs:choice minOccurs="0" maxOccurs="1">
  53 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  54 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  55 + <!-- <xs:element ref="m2m:transaction" /> -->
  56 + </xs:choice>
  57 + </xs:choice>
  58 + </xs:sequence>
  59 + </xs:extension>
  60 + </xs:complexContent>
  61 + </xs:complexType>
  62 + </xs:element>
  63 +</xs:schema>
0 64 \ 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_6_0.xsd" />
  31 + <xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
  32 + <xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
  33 +
  34 + <xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
  35 + <xs:complexType>
  36 + <xs:complexContent>
  37 + <!-- Inherit common attributes for announceable Resources -->
  38 + <xs:extension base="m2m:announceableResource">
  39 + <xs:sequence>
  40 + <!-- Resource Specific Attributes -->
  41 + <xs:element name="sessionOriginatorID" type="m2m:ID" />
  42 + <xs:element name="acceptedSessionDescriptions" type="m2m:sessionDescriptions" />
  43 + <xs:element name="offeredSessionDescriptions" type="m2m:sessionDescriptions" />
  44 + <xs:element name="sessionState" type="m2m:sessionState" />
  45 +
  46 + <!-- Child Resources -->
  47 + <xs:choice minOccurs="0" maxOccurs="1">
  48 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  49 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  50 + <xs:element ref="m2m:subscription" />
  51 + <xs:element ref="m2m:accessControlPolicy" />
  52 + </xs:choice>
  53 + </xs:choice>
  54 + </xs:sequence>
  55 + </xs:extension>
  56 + </xs:complexContent>
  57 + </xs:complexType>
  58 + </xs:element>
  59 +
  60 + <xs:element name="multimediaSessionAnnc" substitutionGroup="m2m:sg_announcedResource">
  61 + <xs:complexType>
  62 + <xs:complexContent>
  63 + <!-- Inherit common attributes for announced Resources -->
  64 + <xs:extension base="m2m:announcedResource">
  65 + <xs:sequence>
  66 + <xs:element name="sessionOriginatorID" type="m2m:ID" />
  67 + <xs:element name="acceptedSessionDescriptions" type="m2m:sessionDescriptions" />
  68 + <xs:element name="sessionState" type="m2m:sessionState" />
  69 +
  70 + <!-- Child Resources -->
  71 + <xs:choice minOccurs="0" maxOccurs="1">
  72 + <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
  73 + <xs:choice minOccurs="1" maxOccurs="unbounded">
  74 + <xs:element ref="m2m:subscription" />
  75 + <xs:element ref="m2m:accessControlPolicy" />
  76 + <xs:element ref="m2m:accessControlPolicyAnnc" />
  77 + </xs:choice>
  78 + </xs:choice>
  79 + </xs:sequence>
  80 + </xs:extension>
  81 + </xs:complexContent>
  82 + </xs:complexType>
  83 + </xs:element>
  84 +</xs:schema>
0 85 \ No newline at end of file
... ...
... ... @@ -53,8 +53,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
53 53 <xs:sequence>
54 54 <xs:element name="nodeID" type="m2m:nodeID" />
55 55 <xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
  56 + <xs:element name="hostedAELinks" type="m2m:listOfM2MID" minOccurs="0" />
  57 + <xs:element name="hostedServiceLinks" type="m2m:listOfM2MID" minOccurs="0" />
56 58 <xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" />
57   -
  59 +
58 60 <!-- Child Resources -->
59 61 <xs:choice minOccurs="0" maxOccurs="1">
60 62 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
... ... @@ -91,6 +93,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
91 93 <xs:sequence>
92 94 <xs:element name="nodeID" type="m2m:nodeID" />
93 95 <xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
  96 + <xs:element name="hostedAELinks" type="m2m:listOfM2MID" minOccurs="0" />
  97 + <xs:element name="hostedServiceLinks" type="m2m:listOfM2MID" minOccurs="0" />
94 98 <xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" />
95 99  
96 100 <!-- Child Resources -->
... ...
... ... @@ -63,6 +63,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
63 63 <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
64 64 <xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" />
65 65 <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
  66 + <xs:element name="multicastCapability" type="m2m:multicastCapability" minOccurs="0" />
  67 + <xs:element name="externalGroupID" type="m2m:externalID" minOccurs="0" />
66 68  
67 69 <!-- Child Resources -->
68 70 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -114,6 +116,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
114 116 <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
115 117 <xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" />
116 118 <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
  119 + <xs:element name="multicastCapability" type="m2m:multicastCapability" minOccurs="0" />
  120 + <xs:element name="externalGroupID" type="m2m:externalID" minOccurs="0" />
117 121  
118 122 <!-- Child Resources -->
119 123 <xs:choice minOccurs="0" maxOccurs="1">
... ...
... ... @@ -126,7 +126,10 @@ 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 + <!-- parameter "Release Version Indicator" -->
129 130 <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
  131 + <!-- parameter "Vendor Information" -->
  132 + <xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
130 133 </xs:sequence>
131 134 </xs:complexType>
132 135 </xs:element>
... ...
... ... @@ -109,7 +109,10 @@ 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 + <!-- parameter "Release Version Indicator" -->
  113 + <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
  114 + <!-- parameter "Vendor Information" -->
  115 + <xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
113 116 </xs:sequence>
114 117 </xs:complexType>
115 118 </xs:element>
... ...
... ... @@ -36,8 +36,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
36 36 <xs:extension base="m2m:announceableSubordinateResource">
37 37 <xs:sequence>
38 38 <!-- Resource Specific Attributes -->
39   - <xs:element name="scheduleElement" type="m2m:scheduleEntries" />
40   -
  39 + <xs:element name="scheduleElement" type="m2m:scheduleEntries" />
  40 + <xs:element name="networkCoordinated" type="xs:boolean" />
  41 +
41 42 <!-- Child Resources -->
42 43 <xs:choice minOccurs="0" maxOccurs="1">
43 44 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
... ... @@ -58,6 +59,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
58 59 <xs:sequence>
59 60 <!-- Resource Specific Attributes -->
60 61 <xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" />
  62 + <xs:element name="networkCoordinated" type="xs:boolean" />
61 63 </xs:sequence>
62 64 </xs:extension>
63 65 </xs:complexContent>
... ...
... ... @@ -44,7 +44,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
44 44 </xs:simpleType>
45 45 </xs:element>
46 46 <xs:element name="ruleLinks" type="m2m:listOfURIs" minOccurs="0" />
47   -
  47 + <xs:element name="niddRequired" type="xs:boolean" minOccurs="0" />
  48 +
48 49 <!-- Child Resources -->
49 50 <xs:choice minOccurs="0" maxOccurs="1">
50 51 <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
... ...
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<project version="16.1">
  3 + <meta>
  4 + <filters directoryPatterns="" filePatterns="" positiveFilePatterns="" showHiddenFiles="false"/>
  5 + <options/>
  6 + </meta>
  7 + <projectTree name="newProject.xpr">
  8 + <folder path="."/>
  9 + </projectTree>
  10 +</project>
0 11 \ No newline at end of file
... ...