Commit ce5456c6 authored by Wolfgang Granzow's avatar Wolfgang Granzow

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

See dedailed list of changes in PRO-2018.0066
parent 8526468d
...@@ -37,6 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -37,6 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" /> <xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
<xs:include schemaLocation="CDT-trafficPattern-v3_6_0.xsd" /> <xs:include schemaLocation="CDT-trafficPattern-v3_6_0.xsd" />
<xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" /> <xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
<xs:include schemaLocation="CDT-multimediaSession-v3_6_0.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource"> <xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType> <xs:complexType>
...@@ -58,6 +59,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -58,6 +59,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" /> <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
<xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" /> <xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
<xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" /> <xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
<xs:element name="sessionCapabilities" type="m2m:sessionCapabilities" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <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,6 +76,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:trafficPattern" /> <xs:element ref="m2m:trafficPattern" />
<xs:element ref="m2m:sg_flexContainerResource" /> <xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:semanticMashupInstance" /> <xs:element ref="m2m:semanticMashupInstance" />
<xs:element ref="m2m:multimediaSession" />
</xs:choice> </xs:choice>
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
...@@ -101,6 +104,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -101,6 +104,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" /> <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
<xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" /> <xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
<xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" /> <xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
<xs:element name="sessionCapabilities" type="m2m:sessionCapabilities" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <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,6 +126,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:sg_announcedFlexContainerResource" /> <xs:element ref="m2m:sg_announcedFlexContainerResource" />
<xs:element ref="m2m:semanticMashupInstance" /> <xs:element ref="m2m:semanticMashupInstance" />
<xs:element ref="m2m:semanticMashupInstanceAnnc" /> <xs:element ref="m2m:semanticMashupInstanceAnnc" />
<xs:element ref="m2m:multimediaSession" />
<xs:element ref="m2m:multimediaSessionAnnc" />
</xs:choice> </xs:choice>
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
......
...@@ -53,6 +53,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -53,6 +53,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_6_0.xsd" /> <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_6_0.xsd" />
<xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" /> <xs:include schemaLocation="CDT-semanticMashupInstance-v3_6_0.xsd" />
<xs:include schemaLocation="CDT-AEContactList-v3_6_0.xsd" /> <xs:include schemaLocation="CDT-AEContactList-v3_6_0.xsd" />
<xs:include schemaLocation="CDT-localMulticastGroup-v3_6_0.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource"> <xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType> <xs:complexType>
...@@ -107,6 +108,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -107,6 +108,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticMashupJobProfile" /> <xs:element ref="m2m:semanticMashupJobProfile" />
<xs:element ref="m2m:semanticMashupInstance" /> <xs:element ref="m2m:semanticMashupInstance" />
<xs:element ref="m2m:AEContactList" /> <xs:element ref="m2m:AEContactList" />
<xs:element ref="m2m:localMulticastGroup" />
</xs:choice> </xs:choice>
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
......
...@@ -194,11 +194,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -194,11 +194,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="pointOfAccess">
<xs:restriction base="xs:anyURI">
<xs:pattern value="(http|HTTP|coap|COAP|mqtt|MQTT|ws|WS)(s|S)?://[\w/!#$^_\.+&amp;\-:;=]+" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="poaList"> <xs:simpleType name="poaList">
<xs:restriction> <xs:restriction>
<xs:simpleType> <xs:simpleType>
<xs:list itemType="xs:string" /> <xs:list itemType="m2m:pointOfAccess" />
</xs:simpleType> </xs:simpleType>
<xs:minLength value="1" /> <xs:minLength value="1" />
</xs:restriction> </xs:restriction>
...@@ -369,11 +374,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -369,11 +374,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="listOfDuration"> <xs:simpleType name="listOfDuration">
<list itemType="xs:duration" /> <xs:restriction>
<xs:simpleType>
<xs:list itemType="xs:duration" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="attributeList"> <xs:simpleType name="attributeList">
<list itemType="xs:NCName" /> <xs:restriction>
<xs:simpleType>
<xs:list itemType="xs:NCName" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="resourceTypeList"> <xs:simpleType name="resourceTypeList">
...@@ -475,6 +490,25 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -475,6 +490,25 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType> </xs:simpleType>
</xs:union> </xs:union>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="TMGI">
<xs:restriction base="xs:string" >
<xs:pattern value="([a-fA-F0-9]{6})[\d]{5}[\d]?" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="sessionDescription">
<xs:restriction base="xs:string" />
</xs:simpleType>
<xs:simpleType name="sessionCapabilities">
<xs:restriction>
<xs:simpleType>
<xs:list itemType="m2m:mediaType" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
<!--********************** --> <!--********************** -->
...@@ -570,6 +604,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -570,6 +604,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/> <xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/>
<xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/> <xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/>
<xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/> <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
<xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
...@@ -1183,7 +1218,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -1183,7 +1218,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- the URL of the container/flexContainer resource for the Input/OutputDataPoint or OperationIn-/Output --> <!-- the URL of the container/flexContainer resource for the Input/OutputDataPoint or OperationIn-/Output -->
<xs:element name="dataContainerID" type="m2m:ID" /> <xs:element name="dataContainerID" type="m2m:ID" />
<!-- if the dataLink references simpe type data the element shall contain --> <!-- if the dataLink references simple type data the element shall contain -->
<!-- a) the name of the customAttribute if URL points to a flexContainer or --> <!-- a) the name of the customAttribute if URL points to a flexContainer or -->
<!-- b) the string "latest" if URL points to a container --> <!-- b) the string "latest" if URL points to a container -->
<!-- if the dataLink references complex-type data (i.e. the complete resource --> <!-- 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,6 +1297,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="privileges" type="m2m:setOfAcrs" minOccurs="0" maxOccurs="unbounded"/> <xs:element name="privileges" type="m2m:setOfAcrs" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="sessionDescriptions">
<xs:sequence>
<xs:element name="sessionDescription" type="m2m:sessionDescription" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
<!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources. Each oneM2M <!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources. Each oneM2M
Resource has a resource type that is defined in a separate schema, but each resource type extends one of the types that is 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,6 +30,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-contentInstance-v3_6_0.xsd" /> <xs:include schemaLocation="CDT-contentInstance-v3_6_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" /> <xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" /> <xs:include schemaLocation="CDT-semanticDescriptor-v3_6_0.xsd" />
<xs:include schemaLocation="CDT-timeSeries-v3_6_0.xsd" />
<xs:element name="container" substitutionGroup="m2m:sg_announceableResource"> <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,7 +59,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:container" /> <xs:element ref="m2m:container" />
<xs:element ref="m2m:subscription" /> <xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" /> <xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:sg_flexContainerResource" /> <xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:timeSeries" />
</xs:choice> </xs:choice>
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
...@@ -97,6 +99,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -97,6 +99,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticDescriptorAnnc" /> <xs:element ref="m2m:semanticDescriptorAnnc" />
<xs:element ref="m2m:sg_flexContainerResource" /> <xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:sg_announcedFlexContainerResource" /> <xs:element ref="m2m:sg_announcedFlexContainerResource" />
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:timeSeriesAnnc" />
</xs:choice> </xs:choice>
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
......
...@@ -119,7 +119,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -119,7 +119,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- AEContactList --> <!-- AEContactList -->
<xs:enumeration value="43" /> <xs:enumeration value="43" />
<!-- AEContactListPerCSE --> <!-- AEContactListPerCSE -->
<xs:enumeration value="44" /> <xs:enumeration value="44" />
<!-- localMulticastGroup -->
<xs:enumeration value="45" />
<!-- multimediaSession -->
<xs:enumeration value="46" />
<!-- accessControlPolicyAnnc --> <!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" /> <xs:enumeration value="10001" />
<!-- AEAnnc --> <!-- AEAnnc -->
...@@ -383,8 +387,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -383,8 +387,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="5210" /> <xs:enumeration value="5210" />
<!-- ESPRIM_ENCRYPTION_ERROR --> <!-- ESPRIM_ENCRYPTION_ERROR -->
<xs:enumeration value="5211" /> <xs:enumeration value="5211" />
<!-- ESPRIM_ENCRYPTION_ERROR --> <!-- SPARQL_UPDATE_ERROR -->
<xs:enumeration value="5212" /> <xs:enumeration value="5212" />
<!-- MASH_UP_OPERATION_FAILED -->
<xs:enumeration value="5213" />
<!-- TARGET_HAS_NO_SESSION_CAPABILITY -->
<xs:enumeration value="5214" />
<!-- SESSION_IS_ONLINE -->
<xs:enumeration value="5215" />
<!-- JOIN_MULTICAST_GROUP_FAILED -->
<xs:enumeration value="5216" />
<!-- LEAVE_MULTICAST_GROUP_FAILED -->
<xs:enumeration value="5217" />
<!-- SPARQL_UPDATE_ERROR --> <!-- SPARQL_UPDATE_ERROR -->
<xs:enumeration value="6003" /> <xs:enumeration value="6003" />
<!-- EXTERNAL_OBJECT_NOT_FOUND --> <!-- EXTERNAL_OBJECT_NOT_FOUND -->
...@@ -526,7 +540,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -526,7 +540,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- AEContactList --> <!-- AEContactList -->
<xs:enumeration value="43" /> <xs:enumeration value="43" />
<!-- AEContactListPerCSE --> <!-- AEContactListPerCSE -->
<xs:enumeration value="44" /> <xs:enumeration value="44" />
<!-- multimediaSession -->
<xs:enumeration value="46" />
<!-- accessControlPolicyAnnc --> <!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" /> <xs:enumeration value="10001" />
<!-- AEAnnc --> <!-- AEAnnc -->
...@@ -569,6 +585,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -569,6 +585,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10041" /> <xs:enumeration value="10041" />
<!-- semanticMashupResultAnnc --> <!-- semanticMashupResultAnnc -->
<xs:enumeration value="10042" /> <xs:enumeration value="10042" />
<!-- multimediaSessionAnnc -->
<xs:enumeration value="10046" />
<!-- oldest --> <!-- oldest -->
<xs:enumeration value="20001" /> <xs:enumeration value="20001" />
<!-- latest --> <!-- latest -->
...@@ -849,8 +867,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -849,8 +867,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="1018" /> <xs:enumeration value="1018" />
<!-- cmdhBuffer --> <!-- cmdhBuffer -->
<xs:enumeration value="1019" /> <xs:enumeration value="1019" />
<!-- registration -->
<xs:enumeration value="1020" />
<!-- dataCollection -->
<xs:enumeration value="1021" />
<!-- authenticationProfile -->
<xs:enumeration value="1022" />
<!-- myCertFileCred -->
<xs:enumeration value="1023" />
<!-- trustAnchorCred -->
<xs:enumeration value="1024" />
<!-- MAFClientRegCfg -->
<xs:enumeration value="1025" />
<!-- MEFClientRegCfg -->
<xs:enumeration value="1026" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
...@@ -1408,7 +1438,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -1408,7 +1438,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:annotation> </xs:annotation>
<xs:restriction base="xs:integer"> <xs:restriction base="xs:integer">
<!-- Location_Change --> <!-- Location_Change -->
<xs:enumeration value="0" /> <xs:enumeration value="1" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
...@@ -1425,6 +1455,30 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -1425,6 +1455,30 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="multicastCapability">
<xs:annotation>
<xs:documentation>Used for multicastCapability attribute in remoteCSE resource and multicastType element in Multicast Group Information Data Object</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- MBMS -->
<xs:enumeration value="1" />
<!-- IP -->
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="sessionState">
<xs:annotation>
<xs:documentation>Used for sessionState attribute of multimediaSession resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- OFFLINE -->
<xs:enumeration value="1" />
<!-- ONLINE -->
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
</xs:schema> </xs:schema>
...@@ -43,7 +43,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -43,7 +43,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="memberType" type="m2m:memberType" /> <xs:element name="memberType" type="m2m:memberType" />
<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" /> <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" />
<xs:element name="maxNrOfMembers" type="xs:positiveInteger" /> <xs:element name="maxNrOfMembers" type="xs:positiveInteger" />
<xs:element name="memberIDs" type="m2m:listOfURIs" /> <xs:element name="memberIDs">
<xs:simpleType>
<xs:list itemType="xs:anyURI"/>
</xs:simpleType>
</xs:element>
<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" /> <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0"/> <xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0"/>
<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" /> <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
......
<?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-v3_6_0.xsd" />
<!-- resource typ e not implemented yet: -->
<!-- <xs:include schemaLocation="CDT-transaction-v3_6_0.xsd" /> -->
<xs:element name="localMulticastGroup" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
<xs:extension base="m2m:regularResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="externalGroupID" type="m2m:externalID" minOccurs="0" />
<xs:element name="multicastAddress" type="m2m:ipAddress" />
<xs:element name="multicastGroupFanoutTarget" type="xs:anyURI" />
<xs:element name="memberList" type="m2m:listOfURIs" />
<xs:element name="responseTarget" type="xs:anyURI" />
<xs:element name="responseTimeWindow" type="xs:duration" minOccurs="0" />
<xs:element name="TMGI" type="m2m:TMGI" 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:schema>
\ No newline at end of file
<?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-v3_6_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_6_0.xsd" />
<xs:include schemaLocation="CDT-accessControlPolicy-v3_6_0.xsd" />
<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
<xs:extension base="m2m:announceableResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="sessionOriginatorID" type="m2m:ID" />
<xs:element name="acceptedSessionDescriptions" type="m2m:sessionDescriptions" />
<xs:element name="offeredSessionDescriptions" type="m2m:sessionDescriptions" />
<xs:element name="sessionState" type="m2m:sessionState" />
<!-- 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:accessControlPolicy" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
<xs:element name="multimediaSessionAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announced Resources -->
<xs:extension base="m2m:announcedResource">
<xs:sequence>
<xs:element name="sessionOriginatorID" type="m2m:ID" />
<xs:element name="acceptedSessionDescriptions" type="m2m:sessionDescriptions" />
<xs:element name="sessionState" type="m2m:sessionState" />
<!-- 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:accessControlPolicy" />
<xs:element ref="m2m:accessControlPolicyAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
</xs:schema>
\ 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,8 +53,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence> <xs:sequence>
<xs:element name="nodeID" type="m2m:nodeID" /> <xs:element name="nodeID" type="m2m:nodeID" />
<xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" /> <xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
<xs:element name="hostedAELinks" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="hostedServiceLinks" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" /> <xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> <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,6 +93,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence> <xs:sequence>
<xs:element name="nodeID" type="m2m:nodeID" /> <xs:element name="nodeID" type="m2m:nodeID" />
<xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" /> <xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
<xs:element name="hostedAELinks" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="hostedServiceLinks" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" /> <xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
......
...@@ -63,6 +63,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -63,6 +63,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" /> <xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" /> <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
<xs:element name="multicastCapability" type="m2m:multicastCapability" minOccurs="0" />
<xs:element name="externalGroupID" type="m2m:externalID" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <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,6 +116,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" /> <xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" /> <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
<xs:element name="multicastCapability" type="m2m:multicastCapability" minOccurs="0" />
<xs:element name="externalGroupID" type="m2m:externalID" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <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,7 +126,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/> <xs:element name="authorRelIndicator" type="xs:boolean" minOccurs="0"/>
<!-- parameter " Semantic Query Indicator" --> <!-- parameter " Semantic Query Indicator" -->
<xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/> <xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/>
<!-- parameter "Release Version Indicator" -->
<xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/> <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
<!-- parameter "Vendor Information" -->
<xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
......
...@@ -109,7 +109,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -109,7 +109,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="tokenRequestInformation" type="m2m:dynAuthTokenReqInfo" minOccurs="0" /> <xs:element name="tokenRequestInformation" type="m2m:dynAuthTokenReqInfo" minOccurs="0" />
<!-- parameter "Authorization Signature Request Information --> <!-- parameter "Authorization Signature Request Information -->
<xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" /> <xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" />
<xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/> <!-- parameter "Release Version Indicator" -->
<xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
<!-- parameter "Vendor Information" -->
<xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
......
...@@ -36,8 +36,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -36,8 +36,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announceableSubordinateResource"> <xs:extension base="m2m:announceableSubordinateResource">
<xs:sequence> <xs:sequence>
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="scheduleElement" type="m2m:scheduleEntries" /> <xs:element name="scheduleElement" type="m2m:scheduleEntries" />
<xs:element name="networkCoordinated" type="xs:boolean" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> <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,6 +59,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence> <xs:sequence>
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" /> <xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" />
<xs:element name="networkCoordinated" type="xs:boolean" />
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
......
...@@ -44,7 +44,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -44,7 +44,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType> </xs:simpleType>
</xs:element> </xs:element>
<xs:element name="ruleLinks" type="m2m:listOfURIs" minOccurs="0" /> <xs:element name="ruleLinks" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="niddRequired" type="xs:boolean" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" /> <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
......
<?xml version="1.0" encoding="UTF-8"?>
<project version="16.1">
<meta>
<filters directoryPatterns="" filePatterns="" positiveFilePatterns="" showHiddenFiles="false"/>
<options/>
</meta>
<projectTree name="newProject.xpr">
<folder path="."/>
</projectTree>
</project>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment