From e9c00f6ddc60d8a9423b82efdac29e390a4fe5d5 Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 11 May 2020 14:52:57 +0200
Subject: [PATCH] XSD v3_5_0 baseline
---
CDT-AE.xsd | 7 +++
CDT-AEContactList.xsd | 57 +++++++++++++++++
CDT-AEContactListPerCSE.xsd | 49 +++++++++++++++
CDT-CSEBase.xsd | 7 ++-
CDT-commonTypes.xsd | 55 ++++++++++++++++-
CDT-deviceInfo.xsd | 4 +-
CDT-enumerationTypes.xsd | 42 ++++++++++++-
CDT-locationPolicy.xsd | 6 +-
CDT-notification.xsd | 31 +++++++---
CDT-ontology.xsd | 86 ++++++++++++++++++++++++++
CDT-ontologyRepository.xsd | 82 +++++++++++++++++++++++++
CDT-remoteCSE.xsd | 2 +
CDT-requestPrimitive.xsd | 1 +
CDT-responsePrimitive.xsd | 1 +
CDT-semanticMashupInstance.xsd | 101 +++++++++++++++++++++++++++++++
CDT-semanticMashupJobProfile.xsd | 96 +++++++++++++++++++++++++++++
CDT-semanticMashupResult.xsd | 87 ++++++++++++++++++++++++++
CDT-subscription.xsd | 4 +-
CDT-timeSeries.xsd | 4 +-
19 files changed, 703 insertions(+), 19 deletions(-)
create mode 100644 CDT-AEContactList.xsd
create mode 100644 CDT-AEContactListPerCSE.xsd
create mode 100644 CDT-ontology.xsd
create mode 100644 CDT-ontologyRepository.xsd
create mode 100644 CDT-semanticMashupInstance.xsd
create mode 100644 CDT-semanticMashupJobProfile.xsd
create mode 100644 CDT-semanticMashupResult.xsd
diff --git a/CDT-AE.xsd b/CDT-AE.xsd
index 54ed582..696daf9 100644
--- a/CDT-AE.xsd
+++ b/CDT-AE.xsd
@@ -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="contentSerialization" type="m2m:serializations" 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 -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -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="contentSerialization" type="m2m:serializations" 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 -->
<xs:choice minOccurs="0" maxOccurs="1">
diff --git a/CDT-AEContactList.xsd b/CDT-AEContactList.xsd
new file mode 100644
index 0000000..f46eaa9
--- /dev/null
+++ b/CDT-AEContactList.xsd
@@ -0,0 +1,57 @@
+<?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.xsd" />
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+ <xs:include schemaLocation="CDT-AEContactListPerCSE.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>
diff --git a/CDT-AEContactListPerCSE.xsd b/CDT-AEContactListPerCSE.xsd
new file mode 100644
index 0000000..2870ec4
--- /dev/null
+++ b/CDT-AEContactListPerCSE.xsd
@@ -0,0 +1,49 @@
+<?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.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>
diff --git a/CDT-CSEBase.xsd b/CDT-CSEBase.xsd
index 0a3879c..032c30f 100644
--- a/CDT-CSEBase.xsd
+++ b/CDT-CSEBase.xsd
@@ -52,6 +52,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-ontologyRepository.xsd" />
<xs:include schemaLocation="CDT-semanticMashupJobProfile.xsd" />
<xs:include schemaLocation="CDT-semanticMashupInstance.xsd" />
+ <xs:include schemaLocation="CDT-AEContactList.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
@@ -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="contentSerialization" type="m2m:serializations" minOccurs="0" />
<xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
-
+ <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
+
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
<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
<xs:element ref="m2m:authorizationInformation" />
<xs:element ref="m2m:ontologyRepository" />
<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:sequence>
diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index 79cc518..9030bbe 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -290,6 +290,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="mediaType">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="[\w/!#$^_\.+&\-;=]+" />
+ </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">
<union>
<simpleType>
@@ -424,7 +439,44 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType>
</xs:union>
</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 -->
<!--********************** -->
@@ -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="authorRelIndicator" 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:complexType>
-<!-- primitiveContent defined in CDT-reqestPrimitive and CDT-responsePrimitive ??? -->
+ <!-- primitiveContent used in CDT-reqestPrimitive and CDT-responsePrimitive -->
<xs:complexType name="primitiveContent">
<xs:choice minOccurs="0" >
<xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" />
diff --git a/CDT-deviceInfo.xsd b/CDT-deviceInfo.xsd
index dcf4314..044fa6d 100644
--- a/CDT-deviceInfo.xsd
+++ b/CDT-deviceInfo.xsd
@@ -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="supportURL" 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 -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -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="supportURL" 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 -->
<xs:choice minOccurs="0" maxOccurs="1">
diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index ebe7ad4..d9bb7be 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -116,6 +116,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="41" />
<!-- semanticMashupResult -->
<xs:enumeration value="42" />
+ <!-- AEContactList -->
+ <xs:enumeration value="43" />
+ <!-- AEContactListPerCSE -->
+ <xs:enumeration value="44" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
@@ -155,7 +159,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- semanticMashupJobProfileAnnc -->
<xs:enumeration value="10040" />
<!-- semanticMashupInstanceAnnc -->
- <xs:enumeration value="10041" />
+ <xs:enumeration value="10041" />
+ <!-- semanticMashupResultAnnc -->
+ <xs:enumeration value="10042" />
</xs:restriction>
</xs:simpleType>
@@ -300,7 +306,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- UPDATED -->
<xs:enumeration value="2004" />
<!-- BAD_REQUEST -->
- <xs:enumeration value="4000" />
+ <xs:enumeration value="4000" />
+ <!-- RELEASE_VERSION_NOT_SUPPORTE -->
+ <xs:enumeration value="4001" />
<!-- NOT_FOUND -->
<xs:enumeration value="4004" />
<!-- OPERATION_NOT_ALLOWED -->
@@ -515,6 +523,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="41" />
<!-- semanticMashupResult -->
<xs:enumeration value="42" />
+ <!-- AEContactList -->
+ <xs:enumeration value="43" />
+ <!-- AEContactListPerCSE -->
+ <xs:enumeration value="44" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
@@ -555,6 +567,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10040" />
<!-- semanticMashupInstanceAnnc -->
<xs:enumeration value="10041" />
+ <!-- semanticMashupResultAnnc -->
+ <xs:enumeration value="10042" />
<!-- oldest -->
<xs:enumeration value="20001" />
<!-- latest -->
@@ -1387,6 +1401,30 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="4" />
</xs:restriction>
</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>
diff --git a/CDT-locationPolicy.xsd b/CDT-locationPolicy.xsd
index 11c1551..4620c2d 100644
--- a/CDT-locationPolicy.xsd
+++ b/CDT-locationPolicy.xsd
@@ -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="locationContainerName" type="xs:string" minOccurs="0" />
<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 -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -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="locationStatus" type="xs:string" 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 -->
</xs:sequence>
diff --git a/CDT-notification.xsd b/CDT-notification.xsd
index 70a5a4e..4905891 100644
--- a/CDT-notification.xsd
+++ b/CDT-notification.xsd
@@ -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:complexType >
<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:complexType>
<xs:sequence>
@@ -56,19 +56,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="verificationRequest" 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="creator" type="m2m:ID" minOccurs="0"/>
- <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/>
- <xs:element name="IPEDiscoveryRequest" minOccurs="0">
+ <xs:element name="verificationRequest" 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="creator" type="m2m:ID" minOccurs="0"/>
+ <xs:element name="notificationForwardingURI" type="xs:anyURI" 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:sequence>
<xs:element name="originator" type="m2m:ID" />
<xs:element name="filterCriteria" type="m2m:filterCriteria" />
</xs:sequence>
</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:complexType>
@@ -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:sequence>
</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>
diff --git a/CDT-ontology.xsd b/CDT-ontology.xsd
new file mode 100644
index 0000000..4f3d1e8
--- /dev/null
+++ b/CDT-ontology.xsd
@@ -0,0 +1,86 @@
+<?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 targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:include schemaLocation="CDT-commonTypes.xsd" />
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+
+
+ <xs:element name="ontology" substitutionGroup="m2m:sg_announceableResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:announceableResource">
+ <xs:sequence>
+ <!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>,
+ <ontologyRepository> and other resources -->
+ <xs:element name="stateTag" type="xs:nonNegativeInteger" />
+ <xs:element name="creator" type="m2m:ID" minOccurs="0" />
+ <!-- Resource Specific Attributes -->
+ <xs:element name="description" type="xs:string" minOccurs="0" />
+ <xs:element name="ontologyFormat" type="m2m:ontologyFormat" />
+ <xs:element name="ontologyContent" type="xs:anySimpleType" />
+ <xs:element name="semanticOpExec" type="m2m:sparql" 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:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="ontologyAnnc" substitutionGroup="m2m:sg_announcedResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:announcedResource">
+ <xs:sequence>
+ <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
+ <xs:element name="stateTag" type="xs:nonNegativeInteger" />
+ <!-- Resource Specific Attributes -->
+ <xs:element name="description" type="xs:string" minOccurs="0" />
+ <xs:element name="ontologyFormat" type="m2m:ontologyFormat" minOccurs="0" />
+ <xs:element name="ontologyContent" type="xs:anySimpleType" minOccurs="0" />
+ <xs:element name="semanticOpExec" type="m2m:sparql" 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:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/CDT-ontologyRepository.xsd b/CDT-ontologyRepository.xsd
new file mode 100644
index 0000000..3985b5b
--- /dev/null
+++ b/CDT-ontologyRepository.xsd
@@ -0,0 +1,82 @@
+<?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 targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:include schemaLocation="CDT-commonTypes.xsd" />
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+ <xs:include schemaLocation="CDT-ontology.xsd" />
+
+
+ <xs:element name="ontologyRepository" substitutionGroup="m2m:sg_announceableResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:announceableResource">
+ <xs:sequence>
+ <!-- Common Attribute, specific to <container>, <contentInstance>, <request>, <delivery>,
+ <ontologyRepository> and other resources -->
+ <xs:element name="stateTag" type="xs:nonNegativeInteger" />
+ <xs:element name="creator" type="m2m:ID" minOccurs="0" />
+ <!-- Resource Specific Attributes: none -->
+
+ <!-- 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:ontology" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="ontologyRepositoryAnnc" substitutionGroup="m2m:sg_announcedResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:announcedResource">
+ <xs:sequence>
+ <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
+ <xs:element name="stateTag" type="xs:nonNegativeInteger" />
+ <!-- Resource Specific Attributes: none -->
+
+ <!-- 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:ontology" />
+ <xs:element ref="m2m:ontologyAnnc" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/CDT-remoteCSE.xsd b/CDT-remoteCSE.xsd
index 62045af..5814fab 100644
--- a/CDT-remoteCSE.xsd
+++ b/CDT-remoteCSE.xsd
@@ -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="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" />
+ <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -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="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
<xs:element name="descendantCSEs" type="m2m:listOfM2MID" minOccurs="0" />
+ <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
diff --git a/CDT-requestPrimitive.xsd b/CDT-requestPrimitive.xsd
index f5c052e..9eb251f 100644
--- a/CDT-requestPrimitive.xsd
+++ b/CDT-requestPrimitive.xsd
@@ -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"/>
<!-- parameter " Semantic Query Indicator" -->
<xs:element name="semanticQueryIndicator" type="xs:boolean" minOccurs="0"/>
+ <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/CDT-responsePrimitive.xsd b/CDT-responsePrimitive.xsd
index 85c581c..13901ee 100644
--- a/CDT-responsePrimitive.xsd
+++ b/CDT-responsePrimitive.xsd
@@ -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" />
<!-- parameter "Authorization Signature Request Information -->
<xs:element name="authorSignReqInfo" type="xs:boolean" minOccurs="0" />
+ <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/CDT-semanticMashupInstance.xsd b/CDT-semanticMashupInstance.xsd
new file mode 100644
index 0000000..a5048c2
--- /dev/null
+++ b/CDT-semanticMashupInstance.xsd
@@ -0,0 +1,101 @@
+<?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 targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:include schemaLocation="CDT-commonTypes.xsd" />
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+ <xs:include schemaLocation="CDT-semanticMashupResult.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+
+ <xs:element name="semanticMashupInstance" substitutionGroup="m2m:sg_announceableResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:announceableResource">
+ <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 -->
+ <xs:element name="smjpID" type="xs:anyURI" />
+ <xs:element name="smjpInputParameter" type="xs:base64Binary" />
+ <xs:element name="memberStoreType" type="m2m:mashupMemberStoreType" />
+ <xs:element name="mashupMember" type="m2m:mashupMember" minOccurs="0"/>
+ <xs:element name="resultGenType" type="m2m:mashupResultGenType" />
+ <xs:element name="periodForResultGen" type="xs:duration" 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:semanticMashupResult" />
+ <xs:element ref="m2m:semanticDescriptor" />
+
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="semanticMashupInstanceAnnc" substitutionGroup="m2m:sg_announcedResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:announcedResource">
+ <xs:sequence>
+ <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
+ <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0"/>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="smjpID" type="xs:anyURI" minOccurs="0"/>
+ <xs:element name="smjpInputParameter" type="xs:base64Binary" minOccurs="0"/>
+ <xs:element name="memberStoreType" type="m2m:mashupMemberStoreType" minOccurs="0"/>
+ <xs:element name="mashupMember" type="m2m:mashupMember" minOccurs="0"/>
+ <xs:element name="resultGenType" type="m2m:mashupResultGenType" minOccurs="0"/>
+ <xs:element name="periodForResultGen" type="xs:duration" 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:semanticMashupResult" />
+ <xs:element ref="m2m:semanticMashupResultAnnc" />
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/CDT-semanticMashupJobProfile.xsd b/CDT-semanticMashupJobProfile.xsd
new file mode 100644
index 0000000..5a30318
--- /dev/null
+++ b/CDT-semanticMashupJobProfile.xsd
@@ -0,0 +1,96 @@
+<?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 targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:include schemaLocation="CDT-commonTypes.xsd" />
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+ <xs:include schemaLocation="CDT-semanticMashupInstance.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+
+ <xs:element name="semanticMashupJobProfile" substitutionGroup="m2m:sg_announceableResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:announceableResource">
+ <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 -->
+ <xs:element name="memberFilter" type="m2m:sparql" />
+ <xs:element name="smiID" type="m2m:listOfURIs" minOccurs="0" />
+ <xs:element name="inputDescriptor" type="xs:base64Binary" minOccurs="0" />
+ <xs:element name="outputDescriptor" type="xs:base64Binary" />
+ <xs:element name="functionDescriptor" type="xs:base64Binary" />
+
+ <!-- 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:semanticMashupInstance" />
+ <xs:element ref="m2m:semanticDescriptor" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="semanticMashupJobProfileAnnc" substitutionGroup="m2m:sg_announcedResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <xs:extension base="m2m:announcedResource">
+ <xs:sequence>
+ <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
+ <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0"/>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="memberFilter" type="m2m:sparql" minOccurs="0" />
+ <xs:element name="smiID" type="m2m:listOfURIs" minOccurs="0" />
+ <xs:element name="inputDescriptor" type="xs:base64Binary" minOccurs="0" />
+ <xs:element name="outputDescriptor" type="xs:base64Binary" minOccurs="0" />
+ <xs:element name="functionDescriptor" 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:semanticMashupInstance" />
+ <xs:element ref="m2m:semanticMashupInstanceAnnc" />
+ <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:semanticDescriptorAnnc" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/CDT-semanticMashupResult.xsd b/CDT-semanticMashupResult.xsd
new file mode 100644
index 0000000..f1c5e3c
--- /dev/null
+++ b/CDT-semanticMashupResult.xsd
@@ -0,0 +1,87 @@
+<?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 targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
+ elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+
+ <xs:element name="semanticMashupResult" 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" />
+ <xs:element name="creator" type="m2m:ID" minOccurs="0" />
+ <!-- Resource Specific Attributes -->
+ <xs:element name="smjpInputParameter" type="xs:base64Binary" minOccurs="0"/>
+ <xs:element name="mashupResultFormat" type="m2m:serializations" />
+ <xs:element name="mashupResult" type="xs:base64Binary"/>
+
+ <!-- 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:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </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>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/CDT-subscription.xsd b/CDT-subscription.xsd
index 6627df0..63fa02f 100644
--- a/CDT-subscription.xsd
+++ b/CDT-subscription.xsd
@@ -107,8 +107,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="batchNotify">
<xs:sequence>
- <xs:element name="number" type="xs:nonNegativeInteger" />
- <xs:element name="duration" type="xs:duration" />
+ <xs:element name="number" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="duration" type="xs:duration" minOccurs="0" />
</xs:sequence>
</xs:complexType>
diff --git a/CDT-timeSeries.xsd b/CDT-timeSeries.xsd
index 669c067..1536889 100644
--- a/CDT-timeSeries.xsd
+++ b/CDT-timeSeries.xsd
@@ -53,7 +53,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="missingDataDetectTimer" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
-
+ <xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
+
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
@@ -87,6 +88,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="missingDataDetectTimer" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
--
GitLab