Skip to content

X
XSD
Commit 19dd2c52 authored by Wolfgang Granzow's avatar Wolfgang Granzow
Browse files
Options

Rel-3 changes agreed at PRO#32 

ee PRO-2017-0383 for a detailed description of the changes
parent 62b66762
Hide whitespace changes
Inline Side-by-side
Showing with 298 additions and 32 deletions
v3_5_0/CDT-AE-v3_5_0.xsd
View file @ 19dd2c52
...@@ -54,6 +54,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -54,6 +54,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="requestReachability" type="xs:boolean" /> <xs:element name="requestReachability" type="xs:boolean" />
<xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" /> <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<xs:element name="M2M-Ext-ID" type="m2m:externalID" minOccurs="0" />
<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
<xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
<xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <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,6 +98,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="requestReachability" type="xs:boolean" minOccurs="0" /> <xs:element name="requestReachability" type="xs:boolean" minOccurs="0" />
<xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" /> <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
<xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
<xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
......
v3_5_0/CDT-AEContactList-v3_5_0.xsd 0 → 100644
View file @ 19dd2c52
<?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_5_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_5_0.xsd" />
<xs:include schemaLocation="CDT-AEContactListPerCSE-v3_5_0.xsd" />
<xs:element name="AEContactList" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
<xs:extension base="m2m:regularResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="numberImpactedCSEs" type="xs:nonNegativeInteger" />
<!-- 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:AEContactListPerCSE" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
</xs:schema>
\ No newline at end of file
v3_5_0/CDT-AEContactListPerCSE-v3_5_0.xsd 0 → 100644
View file @ 19dd2c52
<?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_5_0.xsd" />
<xs:element name="AEContactListPerCSE" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
<xs:extension base="m2m:regularResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="CSE-ID" type="xs:nonNegativeInteger" />
<xs:element name="AE-IDList" type="m2m:listOfM2MID" minOccurs="0"/>
<!-- This resource type has no child Resources -->
</xs:sequence>
</xs:extension>
</xs:complexContent>
</xs:complexType>
</xs:element>
</xs:schema>
\ No newline at end of file
v3_5_0/CDT-CSEBase-v3_5_0.xsd
View file @ 19dd2c52
...@@ -52,6 +52,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -52,6 +52,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-ontologyRepository-v3_5_0.xsd" /> <xs:include schemaLocation="CDT-ontologyRepository-v3_5_0.xsd" />
<xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_5_0.xsd" /> <xs:include schemaLocation="CDT-semanticMashupJobProfile-v3_5_0.xsd" />
<xs:include schemaLocation="CDT-semanticMashupInstance-v3_5_0.xsd" /> <xs:include schemaLocation="CDT-semanticMashupInstance-v3_5_0.xsd" />
<xs:include schemaLocation="CDT-AEContactList-v3_5_0.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource"> <xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType> <xs:complexType>
...@@ -73,7 +74,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -73,7 +74,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" /> <xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" /> <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
<!-- 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" />
...@@ -103,7 +105,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -103,7 +105,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:authorizationInformation" /> <xs:element ref="m2m:authorizationInformation" />
<xs:element ref="m2m:ontologyRepository" /> <xs:element ref="m2m:ontologyRepository" />
<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:choice> </xs:choice>
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
......
v3_5_0/CDT-commonTypes-v3_5_0.xsd
View file @ 19dd2c52
...@@ -290,6 +290,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -290,6 +290,21 @@ 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="mediaType">
<xs:restriction base="xs:string">
<xs:pattern value="[\w/!#$^_\.+&amp;\-;=]+" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="protocolList">
<xs:restriction>
<xs:simpleType>
<xs:list itemType="m2m:mediaType" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="eventCat"> <xs:simpleType name="eventCat">
<union> <union>
<simpleType> <simpleType>
...@@ -424,7 +439,44 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -424,7 +439,44 @@ 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="releaseVersion">
<xs:restriction base="xs:string" >
<xs:pattern value="2a"/>
<xs:pattern value="3"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="applicableReleaseVersion">
<xs:restriction base="xs:string" >
<xs:pattern value="1"/>
<xs:pattern value="2"/>
<xs:pattern value="2a"/>
<xs:pattern value="3"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="supportedReleaseVersions">
<xs:restriction>
<xs:simpleType>
<xs:list itemType="m2m:applicableReleaseVersion" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="mashupMember">
<xs:union>
<xs:simpleType>
<xs:restriction base='xs:base64Binary' />
</xs:simpleType>
<xs:simpleType>
<xs:restriction base='m2m:listOfURIs' />
</xs:simpleType>
</xs:union>
</xs:simpleType>
<!--********************** --> <!--********************** -->
<!-- oneM2M Complex Types --> <!-- oneM2M Complex Types -->
<!--********************** --> <!--********************** -->
...@@ -517,10 +569,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -517,10 +569,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0"/> <xs:element name="authorSigns" type="m2m:signatureList" minOccurs="0"/>
<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:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<!-- primitiveContent defined in CDT-reqestPrimitive and CDT-responsePrimitive ??? --> <!-- primitiveContent used in CDT-reqestPrimitive and CDT-responsePrimitive -->
<xs:complexType name="primitiveContent"> <xs:complexType name="primitiveContent">
<xs:choice minOccurs="0" > <xs:choice minOccurs="0" >
<xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" /> <xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" />
......
v3_5_0/CDT-deviceInfo-v3_5_0.xsd
View file @ 19dd2c52
...@@ -54,7 +54,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -54,7 +54,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="systemTime" type="m2m:timestamp" minOccurs="0"/> <xs:element name="systemTime" type="m2m:timestamp" minOccurs="0"/>
<xs:element name="supportURL" type="xs:anyURI" minOccurs="0"/> <xs:element name="supportURL" type="xs:anyURI" minOccurs="0"/>
<xs:element name="presentationURL" type="xs:anyURI" minOccurs="0"/> <xs:element name="presentationURL" type="xs:anyURI" minOccurs="0"/>
<!-- protocol attribute (multiplicity 0..1(L) ) defined in TS-0001v3_8_0 is missing --> <xs:element name="protocol" type="m2m:protocolList" minOccurs="0"/>
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <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,7 +91,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="systemTime" type="m2m:timestamp" minOccurs="0"/> <xs:element name="systemTime" type="m2m:timestamp" minOccurs="0"/>
<xs:element name="supportURL" type="xs:anyURI" minOccurs="0"/> <xs:element name="supportURL" type="xs:anyURI" minOccurs="0"/>
<xs:element name="presentationURL" type="xs:anyURI" minOccurs="0"/> <xs:element name="presentationURL" type="xs:anyURI" minOccurs="0"/>
<!-- protocol attribute (multiplicity 0..1(L) ) defined in TS-0001v3_8_0 is missing --> <xs:element name="protocol" type="m2m:protocolList" minOccurs="0"/>
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
......
v3_5_0/CDT-enumerationTypes-v3_5_0.xsd
View file @ 19dd2c52
...@@ -116,6 +116,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -116,6 +116,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="41" /> <xs:enumeration value="41" />
<!-- semanticMashupResult --> <!-- semanticMashupResult -->
<xs:enumeration value="42" /> <xs:enumeration value="42" />
<!-- AEContactList -->
<xs:enumeration value="43" />
<!-- AEContactListPerCSE -->
<xs:enumeration value="44" />
<!-- accessControlPolicyAnnc --> <!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" /> <xs:enumeration value="10001" />
<!-- AEAnnc --> <!-- AEAnnc -->
...@@ -155,7 +159,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -155,7 +159,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- semanticMashupJobProfileAnnc --> <!-- semanticMashupJobProfileAnnc -->
<xs:enumeration value="10040" /> <xs:enumeration value="10040" />
<!-- semanticMashupInstanceAnnc --> <!-- semanticMashupInstanceAnnc -->
<xs:enumeration value="10041" /> <xs:enumeration value="10041" />
<!-- semanticMashupResultAnnc -->
<xs:enumeration value="10042" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
...@@ -300,7 +306,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -300,7 +306,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- UPDATED --> <!-- UPDATED -->
<xs:enumeration value="2004" /> <xs:enumeration value="2004" />
<!-- BAD_REQUEST --> <!-- BAD_REQUEST -->
<xs:enumeration value="4000" /> <xs:enumeration value="4000" />
<!-- RELEASE_VERSION_NOT_SUPPORTE -->
<xs:enumeration value="4001" />
<!-- NOT_FOUND --> <!-- NOT_FOUND -->
<xs:enumeration value="4004" /> <xs:enumeration value="4004" />
<!-- OPERATION_NOT_ALLOWED --> <!-- OPERATION_NOT_ALLOWED -->
...@@ -515,6 +523,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -515,6 +523,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="41" /> <xs:enumeration value="41" />
<!-- semanticMashupResult --> <!-- semanticMashupResult -->
<xs:enumeration value="42" /> <xs:enumeration value="42" />
<!-- AEContactList -->
<xs:enumeration value="43" />
<!-- AEContactListPerCSE -->
<xs:enumeration value="44" />
<!-- accessControlPolicyAnnc --> <!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" /> <xs:enumeration value="10001" />
<!-- AEAnnc --> <!-- AEAnnc -->
...@@ -555,6 +567,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -555,6 +567,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10040" /> <xs:enumeration value="10040" />
<!-- semanticMashupInstanceAnnc --> <!-- semanticMashupInstanceAnnc -->
<xs:enumeration value="10041" /> <xs:enumeration value="10041" />
<!-- semanticMashupResultAnnc -->
<xs:enumeration value="10042" />
<!-- oldest --> <!-- oldest -->
<xs:enumeration value="20001" /> <xs:enumeration value="20001" />
<!-- latest --> <!-- latest -->
...@@ -1387,6 +1401,30 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -1387,6 +1401,30 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="4" /> <xs:enumeration value="4" />
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="locationUpdateEventCriteria">
<xs:annotation>
<xs:documentation>Used for locationUpdateEventCriteria attribute of locationPolicy resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- Location_Change -->
<xs:enumeration value="0" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="AERegistrationStatus">
<xs:annotation>
<xs:documentation>Used for registrationStatus attribute in AE resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- ACTIVE -->
<xs:enumeration value="1" />
<!-- INACTIVE -->
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
</xs:schema> </xs:schema>
v3_5_0/CDT-locationPolicy-v3_5_0.xsd
View file @ 19dd2c52
...@@ -44,7 +44,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -44,7 +44,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" /> <xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerName" type="xs:string" minOccurs="0" /> <xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
<xs:element name="locationStatus" type="xs:string" /> <xs:element name="locationStatus" type="xs:string" />
<xs:element name="authID" type="m2m:externalID" minOccurs="0" /> <xs:element name="authID" type="m2m:externalID" minOccurs="0" />
<xs:element name="retrieveLastKnownLocation" type="xs:boolean" minOccurs="0" />
<xs:element name="locationUpdateEventCriteria" type="m2m:locationUpdateEventCriteria" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <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,6 +76,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="locationContainerName" type="xs:string" minOccurs="0" /> <xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
<xs:element name="locationStatus" type="xs:string" minOccurs="0" /> <xs:element name="locationStatus" type="xs:string" minOccurs="0" />
<xs:element name="authID" type="m2m:externalID" minOccurs="0" /> <xs:element name="authID" type="m2m:externalID" minOccurs="0" />
<xs:element name="retrieveLastKnownLocation" type="xs:boolean" minOccurs="0" />
<xs:element name="locationUpdateEventCriteria" type="m2m:locationUpdateEventCriteria" minOccurs="0" />
<!-- No Child Resources --> <!-- No Child Resources -->
</xs:sequence> </xs:sequence>
......
v3_5_0/CDT-notification-v3_5_0.xsd
View file @ 19dd2c52
...@@ -43,7 +43,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -43,7 +43,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="notificationEvent" minOccurs="0"> <xs:element name="notificationEvent" minOccurs="0">
<xs:complexType > <xs:complexType >
<xs:sequence> <xs:sequence>
<xs:element name="representation" type="xs:anyType" minOccurs="0"/> <xs:element name="representation" type="m2m:representation" minOccurs="0"/>
<xs:element name="operationMonitor" minOccurs="0"> <xs:element name="operationMonitor" minOccurs="0">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
...@@ -56,19 +56,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -56,19 +56,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/> <xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/>
<xs:element name="subscriptionDeletion" type="xs:boolean" minOccurs="0"/> <xs:element name="subscriptionDeletion" type="xs:boolean" minOccurs="0"/>
<xs:element name="subscriptionReference" type="xs:anyURI" minOccurs="0"/> <xs:element name="subscriptionReference" type="xs:anyURI" minOccurs="0"/>
<xs:element name="creator" type="m2m:ID" minOccurs="0"/> <xs:element name="creator" type="m2m:ID" minOccurs="0"/>
<xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/> <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/>
<xs:element name="IPEDiscoveryRequest" minOccurs="0"> <xs:element name="notificationTarget" type="m2m:ID" minOccurs="0"/>
<xs:element name="targetRemovalRequest" type="xs:boolean" minOccurs="0"/>
<xs:element name="targetRemovalAllowance" type="xs:boolean" minOccurs="0"/>
<xs:element name="IPEDiscoveryRequest" minOccurs="0">
<xs:complexType > <xs:complexType >
<xs:sequence> <xs:sequence>
<xs:element name="originator" type="m2m:ID" /> <xs:element name="originator" type="m2m:ID" />
<xs:element name="filterCriteria" type="m2m:filterCriteria" /> <xs:element name="filterCriteria" type="m2m:filterCriteria" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="AERegistrationPointChange" type="xs:boolean" minOccurs="0"/>
<xs:element name="AEReferenceIDChange" type="xs:boolean" minOccurs="0"/>
<xs:element name="trackingID1" type="m2m:ID" minOccurs="1"/>
<xs:element name="trackingID2" type="m2m:ID" minOccurs="1"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
...@@ -132,5 +140,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -132,5 +140,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" /> <xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
<xs:complexType name="representation">
<xs:choice minOccurs="0" >
<xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" />
<xs:any namespace="##other" processContents="lax" />
</xs:choice>
</xs:complexType>
</xs:schema> </xs:schema>
v3_5_0/CDT-ontology-v3_5_0.xsd
View file @ 19dd2c52
...@@ -43,7 +43,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -43,7 +43,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="description" type="xs:string" minOccurs="0" /> <xs:element name="description" type="xs:string" minOccurs="0" />
<xs:element name="ontologyFormat" type="m2m:ontologyFormat" /> <xs:element name="ontologyFormat" type="m2m:ontologyFormat" />
<xs:element name="ontologyContent" type="xs:anySimpleType" /> <xs:element name="ontologyContent" type="xs:anySimpleType" />
<xs:element name="semanticOpExec" type="m2m:sparql" 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" />
...@@ -68,6 +69,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -68,6 +69,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="description" type="xs:string" minOccurs="0" /> <xs:element name="description" type="xs:string" minOccurs="0" />
<xs:element name="ontologyFormat" type="m2m:ontologyFormat" minOccurs="0" /> <xs:element name="ontologyFormat" type="m2m:ontologyFormat" minOccurs="0" />
<xs:element name="ontologyContent" type="xs:anySimpleType" minOccurs="0" /> <xs:element name="ontologyContent" type="xs:anySimpleType" minOccurs="0" />
<xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
......
v3_5_0/CDT-remoteCSE-v3_5_0.xsd
View file @ 19dd2c52
...@@ -62,6 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -62,6 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" /> <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
<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" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <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,6 +113,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" /> <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
<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" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
......
v3_5_0/CDT-requestPrimitive-v3_5_0.xsd
View file @ 19dd2c52
...@@ -126,6 +126,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -126,6 +126,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"/>
<!-- 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"/>
<xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
......
v3_5_0/CDT-responsePrimitive-v3_5_0.xsd
View file @ 19dd2c52
...@@ -109,6 +109,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -109,6 +109,7 @@ 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"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
......
v3_5_0/CDT-semanticMashupInstance-v3_5_0.xsd
View file @ 19dd2c52
...@@ -45,9 +45,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -45,9 +45,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="smjpID" type="xs:anyURI" /> <xs:element name="smjpID" type="xs:anyURI" />
<xs:element name="smjpInputParameter" type="xs:base64Binary" /> <xs:element name="smjpInputParameter" type="xs:base64Binary" />
<xs:element name="memberStoreType" type="m2m:mashupMemberStoreType" /> <xs:element name="memberStoreType" type="m2m:mashupMemberStoreType" />
<xs:element name="mashupMember" type="xs:base64Binary" /> <xs:element name="mashupMember" type="m2m:mashupMember" minOccurs="0"/>
<xs:element name="resultGenType" type="m2m:mashupResultGenType" /> <xs:element name="resultGenType" type="m2m:mashupResultGenType" />
<xs:element name="periodForResultGen" type="xs:duration" minOccurs="0" /> <xs:element name="periodForResultGen" type="xs:duration" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <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,23 +72,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announcedResource"> <xs:extension base="m2m:announcedResource">
<xs:sequence> <xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources --> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" /> <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0"/>
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="memberFilter" type="m2m:sparql" minOccurs="0" /> <xs:element name="smjpID" type="xs:anyURI" minOccurs="0"/>
<xs:element name="smiID" type="m2m:listOfURIs" minOccurs="0" /> <xs:element name="smjpInputParameter" type="xs:base64Binary" minOccurs="0"/>
<xs:element name="inputDescriptor" type="xs:base64Binary" minOccurs="0" /> <xs:element name="memberStoreType" type="m2m:mashupMemberStoreType" minOccurs="0"/>
<xs:element name="outputDescriptor" type="xs:base64Binary" minOccurs="0" /> <xs:element name="mashupMember" type="m2m:mashupMember" minOccurs="0"/>
<xs:element name="functionDescriptor" type="xs:base64Binary" minOccurs="0" /> <xs:element name="resultGenType" type="m2m:mashupResultGenType" minOccurs="0"/>
<xs:element name="periodForResultGen" type="xs:duration" 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" />
<xs:choice minOccurs="1" maxOccurs="unbounded"> <xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" /> <xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticMashupResult" /> <xs:element ref="m2m:semanticMashupResult" />
<!-- conflict between TS-0001 and TS-0004: <xs:element ref="m2m:semanticMashupResultAnnc" />
semanticMashupResultAnnc defined as not announceable in TS-0004-->
<!-- <xs:element ref="m2m:semanticMashupResultAnnc" /> -->
<xs:element ref="m2m:semanticDescriptor" /> <xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:semanticDescriptorAnnc" /> <xs:element ref="m2m:semanticDescriptorAnnc" />
......
v3_5_0/CDT-semanticMashupJobProfile-v3_5_0.xsd
View file @ 19dd2c52
...@@ -69,7 +69,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -69,7 +69,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announcedResource"> <xs:extension base="m2m:announcedResource">
<xs:sequence> <xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources --> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" /> <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0"/>
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="memberFilter" type="m2m:sparql" minOccurs="0" /> <xs:element name="memberFilter" type="m2m:sparql" minOccurs="0" />
<xs:element name="smiID" type="m2m:listOfURIs" minOccurs="0" /> <xs:element name="smiID" type="m2m:listOfURIs" minOccurs="0" />
......
v3_5_0/CDT-semanticMashupResult-v3_5_0.xsd
View file @ 19dd2c52
...@@ -34,6 +34,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -34,6 +34,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexContent> <xs:complexContent>
<xs:extension base="m2m:regularResource"> <xs:extension base="m2m:regularResource">
<xs:sequence> <xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>,
<ontology>, and other resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" />
<xs:element name="creator" type="m2m:ID" minOccurs="0" />
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="smjpInputParameter" type="xs:base64Binary" minOccurs="0"/> <xs:element name="smjpInputParameter" type="xs:base64Binary" minOccurs="0"/>
<xs:element name="mashupResultFormat" type="m2m:serializations" /> <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,4 +56,32 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="semanticMashupResultAnnc" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
<xs:complexContent>
<xs:extension base="m2m:regularResource">
<xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>,
<ontology>, and other resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0"/>
<!-- Resource Specific Attributes -->
<xs:element name="smjpInputParameter" type="xs:base64Binary" minOccurs="0"/>
<xs:element name="mashupResultFormat" type="m2m:serializations" minOccurs="0"/>
<xs:element name="mashupResult" type="xs:base64Binary" 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:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:semanticDescriptorAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>