diff --git a/v2_5_0/CDT-AE-v2_5_0.xsd b/v2_5_0/CDT-AE-v2_5_0.xsd
index ddf510879bb4cfdea784575a551940ee1f7db220..8d881f94747a836e3d2ba5071c47186e069e9bd3 100644
--- a/v2_5_0/CDT-AE-v2_5_0.xsd
+++ b/v2_5_0/CDT-AE-v2_5_0.xsd
@@ -33,7 +33,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
<xs:include schemaLocation="CDT-pollingChannel-v2_5_0.xsd" />
<xs:include schemaLocation="CDT-schedule-v2_5_0.xsd" />
-
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_5_0.xsd" />
+
<xs:element name="AE">
<xs:complexType>
<xs:complexContent>
@@ -59,7 +60,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:accessControlPolicy" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:pollingChannel" />
- <xs:element ref="m2m:schedule" />
+ <xs:element ref="m2m:schedule" />
+ <xs:element ref="m2m:semanticDescriptor" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -96,6 +98,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:accessControlPolicyAnnc" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:scheduleAnnc" />
+ <xs:element ref="m2m:semanticDescriptor" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_5_0/CDT-accessControlPolicy-v2_5_0.xsd b/v2_5_0/CDT-accessControlPolicy-v2_5_0.xsd
index cf1effdacde5e80891da63d59f888f32fd4f5d23..3e6bbf151ab98a3d8cffda79cdb8d19f3b2d9846 100644
--- a/v2_5_0/CDT-accessControlPolicy-v2_5_0.xsd
+++ b/v2_5_0/CDT-accessControlPolicy-v2_5_0.xsd
@@ -128,43 +128,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
- <xs:complexType name="locationRegion">
- <xs:choice>
- <xs:element name="countryCode">
- <!-- Space separated list of 2-digit country codes -->
- <xs:simpleType>
- <xs:restriction>
- <xs:simpleType>
- <xs:list itemType="m2m:countryCode" />
- </xs:simpleType>
- <xs:minLength value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="circRegion">
- <!-- "circularRegion" is an ordered list of following three parameters of data type float ´ 1) longitude in the range
- +/-180 degrees 2) latitude in the range +/-90 degrees, 3) radius in meters -->
- <xs:simpleType>
- <xs:restriction>
- <xs:simpleType>
- <xs:list itemType="xs:float" />
- </xs:simpleType>
- <xs:length value="3" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:choice>
- </xs:complexType>
-
- <!-- countryCode as defined in TS-0004 -->
- <xs:simpleType name="countryCode">
- <xs:annotation>
- <xs:documentation>2-character country code as defined by ISO-3166</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:string">
- <xs:pattern value="[A-Z]{2}" />
- </xs:restriction>
- </xs:simpleType>
+ <!-- locationRegion is defined in commonTypes -->
+
+ <!-- countryCode is defined in commonTypes -->
<!-- Initial IPv4 and IPv6 address representation types were found here:
diff --git a/v2_5_0/CDT-commonTypes-v2_5_0.xsd b/v2_5_0/CDT-commonTypes-v2_5_0.xsd
index 0652bdef9a42e0b292d6e130757f2b26ef5701ad..abd0c3e0bb3655e62f9fdb6bee8711252fd024a7 100644
--- a/v2_5_0/CDT-commonTypes-v2_5_0.xsd
+++ b/v2_5_0/CDT-commonTypes-v2_5_0.xsd
@@ -260,7 +260,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="attributeList">
<list itemType="xs:NCName" />
</xs:simpleType>
+
+ <xs:simpleType name="resourceTypeList">
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:resourceType" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ <xs:simpleType name="sparql">
+ <xs:restriction base="xs:string" />
+ </xs:simpleType>
+
+ <xs:simpleType name="descriptorRepresentation">
+ <xs:restriction base="xs:string">
+ <xs:pattern value="application\/rdf\+xml\:1" />
+ </xs:restriction>
+ </xs:simpleType>
+
+
<!--********************** -->
<!-- oneM2M Complex Types -->
<!--********************** -->
@@ -330,13 +350,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
<xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
<xs:element name="labels" type="m2m:labels" minOccurs="0" />
- <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
+ <xs:element name="resourceType" type="m2m:resourceTypeList" minOccurs="0" />
<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="contentType" type="m2m:typeOfContent" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="filterUsage" type="m2m:filterUsage" minOccurs="0" />
<xs:element name="limit" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="semanticsFilter" type="m2m:sparql" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
@@ -506,6 +527,64 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
<!-- m2m:aggregatedResponse is in the ResponsePrimitive xsd file -->
+
+ <xs:complexType name="contentRef">
+ <xs:sequence>
+ <xs:element name="URIReference" minOccurs="1" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name" type="xs:NCName"/>
+ <xs:element name="URI" type="xs:anyURI"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="deletionContexts">
+ <xs:sequence>
+ <xs:element name="timeOfDay" type="m2m:scheduleEntry" minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="locationRegions" type="m2m:locationRegion" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="locationRegion">
+ <xs:choice>
+ <xs:element name="countryCode">
+ <!-- Space separated list of 2-digit country codes -->
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:countryCode" />
+ </xs:simpleType>
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="circRegion">
+ <!-- "circularRegion" is an ordered list of following three parameters of data type float ´ 1) longitude in the range
+ +/-180 degrees 2) latitude in the range +/-90 degrees, 3) radius in meters -->
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="xs:float" />
+ </xs:simpleType>
+ <xs:length value="3" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:choice>
+ </xs:complexType>
+
+ <xs:simpleType name="countryCode">
+ <xs:annotation>
+ <xs:documentation>2-character country code as defined by ISO-3166</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:string">
+ <xs:pattern value="[A-Z]{2}" />
+ </xs:restriction>
+ </xs:simpleType>
+
<!-- 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
@@ -529,6 +608,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence>
<xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" />
<xs:element name="expirationTime" type="m2m:timestamp" />
+ <xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -562,6 +642,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="accessControlPolicyIDs" type="m2m:acpType" />
<xs:element name="expirationTime" type="m2m:timestamp" />
<xs:element name="link" type="xs:anyURI" />
+ <xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -587,6 +668,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:extension>
</xs:complexContent>
</xs:complexType>
+
+ <xs:complexType name="subordinateResource">
+ <xs:complexContent>
+ <xs:extension base="m2m:resource">
+ <xs:sequence>
+ <xs:element name="expirationTime" type="m2m:timestamp" />
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
<xs:complexType name="announcedSubordinateResource">
<xs:complexContent>
diff --git a/v2_5_0/CDT-container-v2_5_0.xsd b/v2_5_0/CDT-container-v2_5_0.xsd
index 8ee50daec620d86c747207beb8bd9cbda8240d0c..83288445a4459daeac61470da31d85849eeb28e2 100644
--- a/v2_5_0/CDT-container-v2_5_0.xsd
+++ b/v2_5_0/CDT-container-v2_5_0.xsd
@@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
<xs:include schemaLocation="CDT-contentInstance-v2_5_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_5_0.xsd" />
<xs:element name="container">
<xs:complexType>
@@ -56,6 +57,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:contentInstance" />
<xs:element ref="m2m:container" />
<xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:semanticDescriptor" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -89,6 +91,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:container" />
<xs:element ref="m2m:containerAnnc" />
<xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:semanticDescriptor" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_5_0/CDT-contentInstance-v2_5_0.xsd b/v2_5_0/CDT-contentInstance-v2_5_0.xsd
index 4adfd16ee6606d492c0c7a29e5b61e3e2bb2f046..827a14d6845ff92acd1dcabe2ad51930c9ca9b45 100644
--- a/v2_5_0/CDT-contentInstance-v2_5_0.xsd
+++ b/v2_5_0/CDT-contentInstance-v2_5_0.xsd
@@ -28,6 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_5_0.xsd" />
<xs:element name="contentInstance">
<xs:complexType>
@@ -40,8 +41,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="creator" type="m2m:ID" minOccurs="0" />
<xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
<xs:element name="contentSize" type="xs:nonNegativeInteger" />
+ <xs:element name="contentRef" type="m2m:contentRef" minOccurs="0"/>
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
<xs:element name="content" type="xs:anyType" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:semanticDescriptor" maxOccurs="unbounded" />
+ </xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -60,6 +68,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
<xs:element name="content" type="xs:anyType" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:semanticDescriptor" maxOccurs="unbounded" />
+ </xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
diff --git a/v2_5_0/CDT-dynamicAuthorizationConsultation-v2_5_0.xsd b/v2_5_0/CDT-dynamicAuthorizationConsultation-v2_5_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..77ae8039a6f0dce3179162bde7024f0239681d1a
--- /dev/null
+++ b/v2_5_0/CDT-dynamicAuthorizationConsultation-v2_5_0.xsd
@@ -0,0 +1,48 @@
+<?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.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, 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-v2_5_0.xsd" />
+
+ <xs:element name="dynamicAuthorizationConsultation">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes for announceable Resources -->
+ <xs:extension base="m2m:regularResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="dynamicAuthorizationEnabled" type="xs:boolean" />
+ <xs:element name="dynamicAuthorizationPoA" type="m2m:listOfURIs" />
+ <xs:element name="dynamicAuthorizationLifetime" type="m2m:timestamp" minOccurs="0" />
+
+ <!-- This Resource Type has no Child Resources -->
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_5_0/CDT-enumerationTypes-v2_5_0.xsd b/v2_5_0/CDT-enumerationTypes-v2_5_0.xsd
index 15e4c1486bbbf907d4c4d067c79933069409463d..8a1f8014dacf8ec3318e7212a7786e489e892a7d 100644
--- a/v2_5_0/CDT-enumerationTypes-v2_5_0.xsd
+++ b/v2_5_0/CDT-enumerationTypes-v2_5_0.xsd
@@ -78,6 +78,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="22" />
<!-- subscription -->
<xs:enumeration value="23" />
+ <!-- semanticDescriptor -->
+ <xs:enumeration value="24" />
+ <!-- dynamicAuthorizationConsultation -->
+ <xs:enumeration value="25" />
+ <!-- notificationTargetPolicy -->
+ <xs:enumeration value="26" />
+ <!-- notificationTargetMgmtPolicyRef -->
+ <xs:enumeration value="27" />
+ <!-- policyDeletionRules -->
+ <xs:enumeration value="28" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
@@ -98,6 +108,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10016" />
<!-- scheduleAnnc -->
<xs:enumeration value="10018" />
+ <!-- semanticDescriptorAnnc -->
+ <xs:enumeration value="10024" />
</xs:restriction>
</xs:simpleType>
@@ -201,6 +213,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="6" />
<!-- Original Resource -->
<xs:enumeration value="7" />
+ <!-- Child Resources -->
+ <xs:enumeration value="8" />
</xs:restriction>
</xs:simpleType>
@@ -266,9 +280,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- SUBSCRIPTION_HOST_HAS_NO_PRIVILEGE -->
<xs:enumeration value="5205" />
<!-- NON_BLOCKING_REQUEST_NOT_SUPPORTED -->
- <xs:enumeration value="5206" />
+ <xs:enumeration value="5206" />
<!-- NOT_ACCEPTABLE -->
<xs:enumeration value="5207" />
+ <!-- DISCOVERY_DENIED_BY_IPE -->
+ <xs:enumeration value="5208" />
<!-- EXTERNAL_OBJECT_NOT_REACHABLE -->
<xs:enumeration value="6003" />
<!-- EXTERNAL_OBJECT_NOT_FOUND -->
@@ -906,7 +922,34 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="1" />
<!-- Conditional Retrieval -->
<xs:enumeration value="2" />
+ <!-- IPE On-demand Discovery -->
+ <xs:enumeration value="3" />
</xs:restriction>
</xs:simpleType>
+
+ <xs:simpleType name="notificationTargetPolicyAction">
+ <xs:annotation>
+ <xs:documentation>Used in filterCriteria</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- accept request -->
+ <xs:enumeration value="1" />
+ <!-- reject request -->
+ <xs:enumeration value="2" />
+ <!-- seek authorization from subscription originator before responding -->
+ <xs:enumeration value="3" />
+ <!-- inform the subscription originator without taking any action -->
+ <xs:enumeration value="4" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="logicalOperator">
+ <xs:restriction base="xs:integer">
+ <!-- AND Operation -->
+ <xs:enumeration value="1" />
+ <!-- OR Operation -->
+ <xs:enumeration value="2" />
+ </xs:restriction>
+ </xs:simpleType>
</xs:schema>
diff --git a/v2_5_0/CDT-group-v2_5_0.xsd b/v2_5_0/CDT-group-v2_5_0.xsd
index eec529ba57c2d8725c6ff7c845e72c183b15fabd..222b94fa6b07f95cec3383c0e39205aeb3579686 100644
--- a/v2_5_0/CDT-group-v2_5_0.xsd
+++ b/v2_5_0/CDT-group-v2_5_0.xsd
@@ -29,6 +29,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes-v2_5_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_5_0.xsd" />
<xs:element name="group">
<xs:complexType>
@@ -49,10 +50,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Child Resources -->
<xs:element name="fanOutPoint" type="xs:anyURI" />
+ <xs:element name="semanticFanOutPoint" type="xs:anyURI" minOccurs="0" />
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:element ref="m2m:subscription" 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>
@@ -80,7 +85,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:element ref="m2m:subscription" 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>
diff --git a/v2_5_0/CDT-node-v2_5_0.xsd b/v2_5_0/CDT-node-v2_5_0.xsd
index 2dc84050d47c6f48335d28245db73a1f133e4524..d27bc0923b506c7c1bf249ec977c6e1b88a51514 100644
--- a/v2_5_0/CDT-node-v2_5_0.xsd
+++ b/v2_5_0/CDT-node-v2_5_0.xsd
@@ -41,6 +41,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-cmdhPolicy-v2_5_0.xsd" />
<xs:include schemaLocation="CDT-activeCmdhPolicy-v2_5_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_5_0.xsd" />
<xs:element name="node">
<xs:complexType>
@@ -69,6 +70,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:cmdhPolicy" />
<xs:element ref="m2m:activeCmdhPolicy" />
<xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:semanticDescriptor" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -102,6 +104,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:rebootAnnc" />
<xs:element ref="m2m:eventLogAnnc" />
<xs:element ref="m2m:subscription" />
+ <xs:element ref="m2m:semanticDescriptor" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v2_5_0/CDT-notification-v2_5_0.xsd b/v2_5_0/CDT-notification-v2_5_0.xsd
index 8d5779698897117fdcb0777a6dcc16dfb9fa603b..ec1d300ac0715c32b71f572de61761543a46b130 100644
--- a/v2_5_0/CDT-notification-v2_5_0.xsd
+++ b/v2_5_0/CDT-notification-v2_5_0.xsd
@@ -61,6 +61,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<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:complexType >
+ <xs:sequence>
+ <xs:element name="originator" type="m2m:ID" />
+ <xs:element name="filterCriteria" type="m2m:filterCriteria" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
</xs:sequence>
</xs:complexType>
diff --git a/v2_5_0/CDT-notificationTargetMgmtPolicyRef-v2_5_0.xsd b/v2_5_0/CDT-notificationTargetMgmtPolicyRef-v2_5_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..6fd436cacf82b150538f071f7ece037f0f960f38
--- /dev/null
+++ b/v2_5_0/CDT-notificationTargetMgmtPolicyRef-v2_5_0.xsd
@@ -0,0 +1,52 @@
+<?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.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, 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-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+
+ <xs:element name="notificationTargetMgmtPolicyRef">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes -->
+ <xs:extension base="m2m:regularResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="notificationTargetURI" type="m2m:listOfURIs" minOccurs="0" />
+ <xs:element name="notificationlPolicyID" type="m2m:listOfURIs" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_5_0/CDT-notificationTargetPolicy-v2_5_0.xsd b/v2_5_0/CDT-notificationTargetPolicy-v2_5_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..b02f06c4acfe48f2fce03d20d55ac58e7cf2eb38
--- /dev/null
+++ b/v2_5_0/CDT-notificationTargetPolicy-v2_5_0.xsd
@@ -0,0 +1,58 @@
+<?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.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, 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-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-policyDeletionRules-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+
+ <xs:element name="notificationTargetPolicy">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes -->
+ <xs:extension base="m2m:regularResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="action" type="m2m:notificationTargetPolicyAction" minOccurs="1" />
+ <xs:element name="policyLabel" type="xs:token" minOccurs="1" />
+ <xs:element name="rulesRelationship" type="m2m:logicalOperator" minOccurs="0" />
+ <xs:element name="creator" type="m2m:ID" 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:policyDeletionRules" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_5_0/CDT-policyDeletionRules-v2_5_0.xsd b/v2_5_0/CDT-policyDeletionRules-v2_5_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..08ef5b3f3b61ad4ba5808ebe7969b77b218b98b3
--- /dev/null
+++ b/v2_5_0/CDT-policyDeletionRules-v2_5_0.xsd
@@ -0,0 +1,52 @@
+<?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.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, 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-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+
+ <xs:element name="policyDeletionRules">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes -->
+ <xs:extension base="m2m:regularResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="deletionRules" type="m2m:deletionContexts" minOccurs="0" />
+ <xs:element name="deletionRulesRelation" type="m2m:logicalOperator" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
diff --git a/v2_5_0/CDT-pollingChannel-v2_5_0.xsd b/v2_5_0/CDT-pollingChannel-v2_5_0.xsd
index b5cbba3bd5225cfb0dd56402e9ed95f5195ab836..20371472f478db778ecfa62369c3dce5fbe996b0 100644
--- a/v2_5_0/CDT-pollingChannel-v2_5_0.xsd
+++ b/v2_5_0/CDT-pollingChannel-v2_5_0.xsd
@@ -34,7 +34,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes -->
- <xs:extension base="m2m:regularResource">
+ <xs:extension base="m2m:subordinateResource">
<xs:sequence>
<!-- No Resource Specific Attributes -->
diff --git a/v2_5_0/CDT-responsePrimitive-v2_5_0.xsd b/v2_5_0/CDT-responsePrimitive-v2_5_0.xsd
index 947151d316a1dd062dfb542d42faf0723716616e..bc560708f414400074a16c6ac88e643b7ba40a36 100644
--- a/v2_5_0/CDT-responsePrimitive-v2_5_0.xsd
+++ b/v2_5_0/CDT-responsePrimitive-v2_5_0.xsd
@@ -155,7 +155,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:statsConfig" />
<xs:element ref="m2m:subscription" />
</xs:choice>
- <xs:element name="URIList" type="m2m:listOfURIs" />
+ <xs:element name="URI" type="xs:anyURI" />
</xs:sequence>
</xs:complexType>
diff --git a/v2_5_0/CDT-semanticDescriptor-v2_5_0.xsd b/v2_5_0/CDT-semanticDescriptor-v2_5_0.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..63ef6d0c8e8fdf2e3cbd2663e8d0938eda636e6c
--- /dev/null
+++ b/v2_5_0/CDT-semanticDescriptor-v2_5_0.xsd
@@ -0,0 +1,56 @@
+<?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.
+© 2015, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, 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-v2_5_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_5_0.xsd" />
+
+ <xs:element name="semanticDescriptor">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes for announceable Resources -->
+ <xs:extension base="m2m:regularResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="creator" type="m2m:ID" minOccurs="0" />
+ <xs:element name="descriptorRepresenation" type="m2m:descriptorRepresentation" minOccurs="0" />
+ <xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
+ <xs:element name="descriptor" type="xs:base64Binary" />
+ <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="relatedSemantics" type="m2m:listOfURIs" minOccurs="0" />
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>