diff --git a/CDT-AE.xsd b/CDT-AE.xsd
index 0918b511338a93c3fae0065b8471d193dc2ad9cd..fb8e0ee69e1214cc231e6f8c381c0fd71b750fa6 100644
--- a/CDT-AE.xsd
+++ b/CDT-AE.xsd
@@ -35,9 +35,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-schedule.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
<xs:include schemaLocation="CDT-timeSeries.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern.xsd" />
<xs:include schemaLocation="CDT-semanticMashupInstance.xsd" />
<xs:include schemaLocation="CDT-multimediaSession.xsd" />
+ <xs:include schemaLocation="CDT-crossResourceSubscription.xsd" />
+ <xs:include schemaLocation="CDT-triggerRequest.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
@@ -60,6 +61,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
<xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
<xs:element name="sessionCapabilities" type="m2m:sessionCapabilities" minOccurs="0" />
+ <xs:element name="triggerEnable" type="xs:boolean" minOccurs="0" />
+ <xs:element name="activityPatternElements" type="m2m:activityPatternElements" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -73,10 +76,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:schedule" />
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:timeSeries" />
- <xs:element ref="m2m:trafficPattern" />
<xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:semanticMashupInstance" />
<xs:element ref="m2m:multimediaSession" />
+ <xs:element ref="m2m:crossResourceSubscription" />
+ <xs:element ref="m2m:triggerRequest" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -105,6 +109,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="registrationStatus" type="m2m:AERegistrationStatus" minOccurs="0" />
<xs:element name="trackRegistrationPoints" type="xs:boolean" minOccurs="0" />
<xs:element name="sessionCapabilities" type="m2m:sessionCapabilities" minOccurs="0" />
+ <xs:element name="triggerEnable" type="xs:boolean" minOccurs="0" />
+ <xs:element name="activityPatternElements" type="m2m:activityPatternElements" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -121,13 +127,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:timeSeries" />
<xs:element ref="m2m:timeSeriesAnnc" />
- <xs:element ref="m2m:trafficPatternAnnc" />
<xs:element ref="m2m:sg_flexContainerResource" />
<xs:element ref="m2m:sg_announcedFlexContainerResource" />
<xs:element ref="m2m:semanticMashupInstance" />
<xs:element ref="m2m:semanticMashupInstanceAnnc" />
<xs:element ref="m2m:multimediaSession" />
<xs:element ref="m2m:multimediaSessionAnnc" />
+ <xs:element ref="m2m:crossResourceSubscription" />
+ <xs:element ref="m2m:triggerRequest" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-CSEBase.xsd b/CDT-CSEBase.xsd
index 380b1ed7b3d18ebdfd65422f974076b1db5942c5..c30213516b6522b29171e2d223a5db1a4af99f93 100644
--- a/CDT-CSEBase.xsd
+++ b/CDT-CSEBase.xsd
@@ -54,6 +54,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-semanticMashupInstance.xsd" />
<xs:include schemaLocation="CDT-AEContactList.xsd" />
<xs:include schemaLocation="CDT-localMulticastGroup.xsd" />
+ <xs:include schemaLocation="CDT-crossResourceSubscription.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
@@ -109,6 +110,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticMashupInstance" />
<xs:element ref="m2m:AEContactList" />
<xs:element ref="m2m:localMulticastGroup" />
+ <xs:element ref="m2m:crossResourceSubscription" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index d811630d452a545b9e53444b1208f9c483ea786b..73e949cebc1d64a3832e4d8bb6a942bd02ba189f 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -509,6 +509,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
+
+ <xs:simpleType name="resourceList" >
+ <xs:list itemType="xs:anyURI" />
+ </xs:simpleType>
+
<!--********************** -->
@@ -616,7 +621,36 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:choice>
</xs:complexType>
- <!-- m2m:batchNotify and m2m:eventNotificationCriteria are defined in the subscription resource file -->
+ <xs:complexType name="eventNotificationCriteria">
+ <xs:sequence>
+ <xs:element name="createdBefore" type="m2m:timestamp" minOccurs="0" />
+ <xs:element name="createdAfter" type="m2m:timestamp" minOccurs="0" />
+ <xs:element name="modifiedSince" type="m2m:timestamp" minOccurs="0" />
+ <xs:element name="unmodifiedSince" type="m2m:timestamp" minOccurs="0" />
+ <xs:element name="stateTagSmaller" type="xs:positiveInteger" minOccurs="0" />
+ <xs:element name="stateTagBigger" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
+ <xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
+ <xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
+ <xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
+ <xs:element name="operationMonitor" type="m2m:operationMonitor" minOccurs="0" maxOccurs="5" />
+ <xs:element name="attribute" type="m2m:attributeList" minOccurs="0" maxOccurs="1" />
+ <xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
+ <xs:element name="childResourceType" minOccurs="0" maxOccurs="1" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:resourceType" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="missingData" type="m2m:missingData" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <!-- m2m:batchNotify is defined in the subscription resource file -->
<xs:complexType name="filterCriteria">
<xs:sequence>
@@ -1228,7 +1262,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
- <!-- data type m2m:operationMonitor is defined in the CDT-subscription XSD file -->
+ <xs:complexType name="operationMonitor">
+ <xs:sequence>
+ <xs:element name="operations" type="m2m:accessControlOperations" minOccurs="0" />
+ <xs:element name="originator" type="m2m:ID" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="dynAuthRelMapRequest">
<xs:sequence>
@@ -1304,6 +1343,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
+ <xs:complexType name="activityPatternElements">
+ <xs:sequence>
+ <xs:element name="activityPatternElements" type="m2m:activityPattern" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="activityPattern">
+ <xs:sequence>
+ <xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="1" maxOccurs="unbounded"/>
+ <xs:element name="stationaryIndication" type="m2m:stationaryIndication" minOccurs="0" />
+ <xs:element name="dataSizeIndicator" type="xs:positiveInteger" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="eventNotificationCriteriaSet">
+ <xs:sequence>
+ <xs:element name="eventNotificationCriteriaEntry" type="m2m:eventNotificationCriteria" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+
<!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources. Each oneM2M
Resource has a resource type that is defined in a separate schema, but each resource type extends one of the types that is
@@ -1417,6 +1477,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="objectIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="objectPaths" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="description" type="xs:string" minOccurs="0" />
+ <xs:element name="mgmtSchema" type="xs:anyURI" minOccurs="0" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -1430,6 +1491,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="objectIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="objectPaths" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="description" type="xs:string" minOccurs="0" />
+ <xs:element name="mgmtSchema" type="xs:anyURI" minOccurs="0" />
</xs:sequence>
</xs:extension>
</xs:complexContent>
@@ -1462,6 +1524,8 @@ 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="containerDefinition" type="xs:anyURI" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="contentSize" type="xs:nonNegativeInteger" />
+ <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
</xs:sequence>
<xs:attribute name="resourceName" type="m2m:resourceName" use="required" />
</xs:complexType>
@@ -1481,6 +1545,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="containerDefinition" type="xs:anyURI" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0"/>
+ <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
</xs:sequence>
<xs:attribute name="resourceName" type="m2m:resourceName" use="required" />
</xs:complexType>
diff --git a/CDT-crossResourceSubscription.xsd b/CDT-crossResourceSubscription.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..bff9afca09d845b1bfc13a289d1a07dc18b7daac
--- /dev/null
+++ b/CDT-crossResourceSubscription.xsd
@@ -0,0 +1,71 @@
+<?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" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:include schemaLocation="CDT-commonTypes.xsd" />
+ <xs:include schemaLocation="CDT-schedule.xsd" />
+ <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef.xsd" />
+
+ <xs:element name="crossResourceSubscription" substitutionGroup="m2m:sg_regularResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes from RegularResource Type -->
+ <xs:extension base="m2m:regularResource">
+ <xs:sequence>
+ <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
+ <xs:element name="creator" type="m2m:ID" />
+ <!-- Resource Specific Attributes -->
+ <xs:element name="regularResourcesAsTarget" type="m2m:resourceList" minOccurs="0" />
+ <xs:element name="subscriptionResourcesAsTarget" type="m2m:resourceList" minOccurs="0" />
+ <xs:element name="timeWindowType" type="m2m:timeWindowType" />
+ <xs:element name="timeWindowSize" type="m2m:absRelTimestamp" />
+ <xs:element name="eventNotificationCriteriaSet" type="m2m:eventNotificationCriteriaSet" minOccurs="0" />
+ <xs:element name="notificationEventCat" type="m2m:eventCat" minOccurs="0" />
+ <xs:element name="expirationCounter" type="xs:positiveInteger" minOccurs="0" />
+ <xs:element name="notificationURI" >
+ <xs:simpleType>
+ <xs:list itemType="xs:anyURI" />
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="subscriberURI" 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:schedule" />
+ <xs:element ref="m2m:notificationTargetMgmtPolicyRef" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index fa84f7a3f2552bb50661d8a6ef9cdff4441cc005..c932f97625a7a47f54bc6810a2b3ba8038de063a 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -96,8 +96,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="31" />
<!-- token -->
<xs:enumeration value="32" />
- <!-- trafficPattern -->
- <xs:enumeration value="33" />
+ <!-- void: trafficPattern -->
<!-- dynamicAuthorizationConsultation -->
<xs:enumeration value="34" />
<!-- authorizationDecision -->
@@ -124,6 +123,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="45" />
<!-- multimediaSession -->
<xs:enumeration value="46" />
+ <!-- triggerRequest -->
+ <xs:enumeration value="47" />
+ <!-- crossResourceSubscription -->
+ <xs:enumeration value="48" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
@@ -152,8 +155,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10029" />
<!-- timeSeriesInstanceAnnc -->
<xs:enumeration value="10030" />
- <!-- trafficPatternAnnc -->
- <xs:enumeration value="10033" />
+ <!-- void: trafficPatternAnnc -->
<!-- dynamicAuthorizationConsultationAnnc -->
<xs:enumeration value="10034" />
<!-- ontologyRepositoryAnnc -->
@@ -358,7 +360,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- LINKED_SEMANTICS_NOT_AVAILABLE -->
<xs:enumeration value="4119" />
<!-- INVALID_SEMANTICS -->
- <xs:enumeration value="4120" />
+ <xs:enumeration value="4120" />
+ <!-- MASHUP_MEMBER_NOT_FOUND -->
+ <xs:enumeration value="4121" />
+ <!-- INVALID_TRIGGER_PURPOSE -->
+ <xs:enumeration value="4122" />
<!-- INTERNAL_SERVER_ERROR -->
<xs:enumeration value="5000" />
<!-- NOT_IMPLEMENTED -->
@@ -389,8 +395,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="5211" />
<!-- SPARQL_UPDATE_ERROR -->
<xs:enumeration value="5212" />
- <!-- MASH_UP_OPERATION_FAILED -->
- <xs:enumeration value="5213" />
+ <!-- void: MASH_UP_OPERATION_FAILED -->
<!-- TARGET_HAS_NO_SESSION_CAPABILITY -->
<xs:enumeration value="5214" />
<!-- SESSION_IS_ONLINE -->
@@ -399,6 +404,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="5216" />
<!-- LEAVE_MULTICAST_GROUP_FAILED -->
<xs:enumeration value="5217" />
+ <!-- TRIGGERING_DISABLED_FOR_RECIPIENT -->
+ <xs:enumeration value="5218" />
+ <!-- UNABLE_TO_REPLACE_TRIGGER_REQUEST -->
+ <xs:enumeration value="5219" />
+ <!-- UNABLE_TO_RECALL_TRIGGER_REQUEST -->
+ <xs:enumeration value="5220" />
+ <!-- CROSS_RESOURCE_OPERATION_FAILURE -->
+ <xs:enumeration value="5221" />
<!-- SPARQL_UPDATE_ERROR -->
<xs:enumeration value="6003" />
<!-- EXTERNAL_OBJECT_NOT_FOUND -->
@@ -517,8 +530,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="31" />
<!-- token -->
<xs:enumeration value="32" />
- <!-- trafficPattern -->
- <xs:enumeration value="33" />
+ <!-- void: trafficPattern -->
<!-- dynamicAuthorizationConsultation -->
<xs:enumeration value="34" />
<!-- authorizationDecision -->
@@ -543,6 +555,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="44" />
<!-- multimediaSession -->
<xs:enumeration value="46" />
+ <!-- triggerRequest -->
+ <xs:enumeration value="47" />
+ <!-- crossResourceSubscription -->
+ <xs:enumeration value="48" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
@@ -571,8 +587,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10029" />
<!-- timeSeriesInstanceAnnc -->
<xs:enumeration value="10030" />
- <!-- trafficPatternAnnc -->
- <xs:enumeration value="10033" />
+ <!-- void: trafficPatternAnnc -->
<!-- dynamicAuthorizationConsultationAnnc -->
<xs:enumeration value="10034" />
<!-- ontologyRepositoryAnnc -->
@@ -827,7 +842,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:documentation>This is used for mgmtObj resource.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
- <!-- unspecified -->
+ <!-- self-defined -->
<xs:enumeration value="0" />
<!-- firmware -->
<xs:enumeration value="1001" />
@@ -1253,21 +1268,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="periodicIndicator">
- <xs:annotation>
- <xs:documentation>Used for periodicIndicator attribute of trafficPattern resource</xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:integer">
- <!-- Periodic -->
- <xs:enumeration value="1" />
- <!-- On demand -->
- <xs:enumeration value="2" />
- </xs:restriction>
- </xs:simpleType>
-
<xs:simpleType name="stationaryIndication">
<xs:annotation>
- <xs:documentation>Used for periodicIndicator attribute of trafficPattern resource</xs:documentation>
+ <xs:documentation>Used for stationaryIndication element attribute of m2m:activityPattern</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- Stationary -->
@@ -1279,7 +1282,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="contentStatus">
<xs:annotation>
- <xs:documentation>Used for periodicIndicator attribute of trafficPattern resource</xs:documentation>
+ <xs:documentation>Used for Content Status response parameter</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- PARTIAL_CONTENT -->
@@ -1309,15 +1312,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="triggerPurpose">
<xs:annotation>
- <xs:documentation>Used for the triggerPurpose field of trigger requests on Mcn</xs:documentation>
+ <xs:documentation>Used for the triggerPurpose field of trigger requests on Mcn and for triggerPurpose attribute of the triggerRequest resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- establishConnection -->
- <xs:enumeration value="0" />
- <!-- registrationRequest -->
<xs:enumeration value="1" />
- <!-- executeCRUD -->
+ <!-- registrationRequest -->
<xs:enumeration value="2" />
+ <!-- executeCRUD -->
+ <xs:enumeration value="3" />
+ <!-- enrolmentRequest -->
+ <xs:enumeration value="4" />
</xs:restriction>
</xs:simpleType>
@@ -1467,7 +1472,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
-
<xs:simpleType name="sessionState">
<xs:annotation>
<xs:documentation>Used for sessionState attribute of multimediaSession resource</xs:documentation>
@@ -1479,6 +1483,38 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
+
+ <xs:simpleType name="triggerStatus">
+ <xs:annotation>
+ <xs:documentation>Used in definining trigger status in the triggerRequest resource</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- PROCESSING -->
+ <xs:enumeration value="1" />
+ <!-- ERROR_NSE_NOT_FOUND -->
+ <xs:enumeration value="2" />
+ <!-- TRIGGER_SUBMITTED -->
+ <xs:enumeration value="3" />
+ <!-- TRIGGER_DELIVERED -->
+ <xs:enumeration value="4" />
+ <!-- TRIGGER_EXPIRED -->
+ <xs:enumeration value="5" />
+ <!-- TRIGGER_FAILED -->
+ <xs:enumeration value="6" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="timeWindowType">
+ <xs:annotation>
+ <xs:documentation>Used for timeWindowType attribute in crossResourceSubscription resource</xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:integer">
+ <!-- PERIODICWINDOW -->
+ <xs:enumeration value="1" />
+ <!-- SLIDINGWINDOW -->
+ <xs:enumeration value="2" />
+ </xs:restriction>
+ </xs:simpleType>
</xs:schema>
diff --git a/CDT-node.xsd b/CDT-node.xsd
index dcea1712b78823b784514ccea8c6d63dfcaa7635..349c4142f8adf6fa0827f41453b4c6ed4bbcc18e 100644
--- a/CDT-node.xsd
+++ b/CDT-node.xsd
@@ -42,7 +42,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-activeCmdhPolicy.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
<xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern.xsd" />
<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
@@ -55,7 +54,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
<xs:element name="hostedAELinks" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="hostedServiceLinks" type="m2m:listOfM2MID" minOccurs="0" />
- <xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" />
+ <xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" />
+ <xs:element name="roamingStatus" type="xs:boolean" minOccurs="0" />
+ <xs:element name="networkID" type="xs:string" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -75,7 +76,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:activeCmdhPolicy" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
- <xs:element ref="m2m:trafficPattern" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -96,6 +96,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="hostedAELinks" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="hostedServiceLinks" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="mgmtClientAddress" type="xs:string" minOccurs="0" />
+ <xs:element name="roamingStatus" type="xs:boolean" minOccurs="0" />
+ <xs:element name="networkID" type="xs:string" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -114,7 +116,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:semanticDescriptor" />
<xs:element ref="m2m:semanticDescriptorAnnc" />
- <xs:element ref="m2m:trafficPatternAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-remoteCSE.xsd b/CDT-remoteCSE.xsd
index ac005627f9e5d59a16f01abebbf98a38d5be231a..fe8cfbf7f5ac6b06e29339656a251286cc6ecb5c 100644
--- a/CDT-remoteCSE.xsd
+++ b/CDT-remoteCSE.xsd
@@ -40,8 +40,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-crossResourceSubscription.xsd" />
<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
@@ -65,6 +64,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
<xs:element name="multicastCapability" type="m2m:multicastCapability" minOccurs="0" />
<xs:element name="externalGroupID" type="m2m:externalID" minOccurs="0" />
+ <xs:element name="triggerEnable" type="xs:boolean" minOccurs="0" />
+ <xs:element name="activityPatternElements" type="m2m:activityPatternElements" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -91,6 +92,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticMashupJobProfileAnnc" />
<xs:element ref="m2m:semanticMashupInstance" />
<xs:element ref="m2m:semanticMashupInstanceAnnc" />
+ <xs:element ref="m2m:crossResourceSubscription" />
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -118,6 +120,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
<xs:element name="multicastCapability" type="m2m:multicastCapability" minOccurs="0" />
<xs:element name="externalGroupID" type="m2m:externalID" minOccurs="0" />
+ <xs:element name="triggerEnable" type="xs:boolean" minOccurs="0" />
+ <xs:element name="activityPatternElements" type="m2m:activityPatternElements" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -144,6 +148,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:semanticMashupJobProfileAnnc" />
<xs:element ref="m2m:semanticMashupInstance" />
<xs:element ref="m2m:semanticMashupInstanceAnnc" />
+ <xs:element ref="m2m:crossResourceSubscription" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-responsePrimitive.xsd b/CDT-responsePrimitive.xsd
index ef6c95a0411a4904855e9ca808445064531bcf92..49ee3386896351c362833732cc3f48b28de379c8 100644
--- a/CDT-responsePrimitive.xsd
+++ b/CDT-responsePrimitive.xsd
@@ -119,7 +119,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resource" type="m2m:resourceWrapper" />
- <xs:element name="URIList" type="m2m:listOfURIs" />
+ <xs:element name="URIList" >
+ <xs:simpleType>
+ <xs:list itemType="xs:anyURI" />
+ </xs:simpleType>
+ </xs:element>
<xs:element name="URI" type="xs:anyURI" />
diff --git a/CDT-statsCollect.xsd b/CDT-statsCollect.xsd
index 8e0a37936fad9601a43ddd868a8980abada1fc70..bb90b94b2bfcd4245be4b8dfccd36003a031583c 100644
--- a/CDT-statsCollect.xsd
+++ b/CDT-statsCollect.xsd
@@ -40,7 +40,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:element name="statsCollectID" type="xs:string" />
<xs:element name="collectingEntityID" type="m2m:ID" />
- <xs:element name="collectedEntityID" type="m2m:ID" />
+ <xs:element name="collectedEntityID" type="m2m:listOfM2MID" />
<xs:element name="statsRuleStatus" type="m2m:statsRuleStatusType" />
<xs:element name="statModel" type="m2m:statModelType" />
<xs:element name="collectPeriod" type="m2m:scheduleEntries" minOccurs="0" />
diff --git a/CDT-subscription.xsd b/CDT-subscription.xsd
index 63fa02fba36e9df4519ec45333fc25028eb582e8..28805e0f16a43522e04f4471081780715ec82e91 100644
--- a/CDT-subscription.xsd
+++ b/CDT-subscription.xsd
@@ -54,6 +54,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="notificationContentType" type="m2m:notificationContentType" />
<xs:element name="notificationEventCat" type="m2m:eventCat" minOccurs="0" />
<xs:element name="subscriberURI" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="associatedCrossResourceSub" type="m2m:resourceList" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -69,42 +70,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:complexType name="eventNotificationCriteria">
- <xs:sequence>
- <xs:element name="createdBefore" type="m2m:timestamp" minOccurs="0" />
- <xs:element name="createdAfter" type="m2m:timestamp" minOccurs="0" />
- <xs:element name="modifiedSince" type="m2m:timestamp" minOccurs="0" />
- <xs:element name="unmodifiedSince" type="m2m:timestamp" minOccurs="0" />
- <xs:element name="stateTagSmaller" type="xs:positiveInteger" minOccurs="0" />
- <xs:element name="stateTagBigger" type="xs:nonNegativeInteger" minOccurs="0" />
- <xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
- <xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
- <xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
- <xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
- <xs:element name="operationMonitor" type="m2m:operationMonitor" minOccurs="0" maxOccurs="5" />
- <xs:element name="attribute" type="m2m:attributeList" minOccurs="0" maxOccurs="1" />
- <xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
- <xs:element name="childResourceType" minOccurs="0" maxOccurs="1" >
- <xs:simpleType>
- <xs:restriction>
- <xs:simpleType>
- <xs:list itemType="m2m:resourceType" />
- </xs:simpleType>
- <xs:minLength value="1" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="missingData" type="m2m:missingData" minOccurs="0" />
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="operationMonitor">
- <xs:sequence>
- <xs:element name="operations" type="m2m:accessControlOperations" minOccurs="0" />
- <xs:element name="originator" type="m2m:ID" minOccurs="0" />
- </xs:sequence>
- </xs:complexType>
-
<xs:complexType name="batchNotify">
<xs:sequence>
<xs:element name="number" type="xs:nonNegativeInteger" minOccurs="0" />
diff --git a/CDT-trafficPattern.xsd b/CDT-trafficPattern.xsd
deleted file mode 100644
index d9a7282ad8fabddfbdccadba8713cb7cd1356ce0..0000000000000000000000000000000000000000
--- a/CDT-trafficPattern.xsd
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright Notification
-
-The oneM2M Partners authorize you to copy this document, provided that you retain all copyright and other proprietary notices
-contained in the original materials on any copies of the materials and that you comply strictly with these terms.
-This copyright permission does not constitute an endorsement of the products or services, nor does it encompass the granting of
-any patent rights. The oneM2M Partners assume no responsibility for errors or omissions in this document.
-© 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, 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" elementFormDefault="unqualified"
- attributeFormDefault="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-schedule.xsd" />
-
- <xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit Common Attributes -->
- <xs:extension base="m2m:announceableResource">
-
- <!-- Resource Specific Attributes -->
- <xs:sequence>
- <xs:element name="provideToNSE" type="xs:boolean" minOccurs="0" maxOccurs="1" />
- <xs:element name="periodicIndicator" type="m2m:periodicIndicator" minOccurs="0" maxOccurs="1" />
- <xs:element name="periodicDurationTime" type="xs:unsignedInt" minOccurs="0" maxOccurs="1" />
- <xs:element name="periodicIntervalTime" type="xs:unsignedInt" minOccurs="0" maxOccurs="1" />
- <xs:element name="stationaryIndication" type="m2m:stationaryIndication" minOccurs="0" maxOccurs="1" />
- <xs:element name="dataSizeIndicator" type="xs:positiveInteger" minOccurs="0" maxOccurs="1" />
- <xs:element name="validityTime" type="m2m:timestamp" minOccurs="0" maxOccurs="1" />
- <xs:element name="targetNetwork" type="m2m:listOfM2MID" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="m2m:subscription" minOccurs="0" maxOccurs="unbounded" />
- <xs:element ref="m2m:schedule" minOccurs="0" maxOccurs="1" />
- </xs:choice>
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="trafficPatternAnnc" substitutionGroup="m2m:sg_announcedResource">
- <xs:complexType>
- <xs:complexContent>
- <!-- Inherit Common Attributes -->
- <xs:extension base="m2m:announcedResource">
-
- <!-- Resource Specific Attributes -->
- <xs:sequence>
- <xs:element name="provideToNSE" type="xs:boolean" minOccurs="0" maxOccurs="1" />
- <xs:element name="periodicIndicator" type="m2m:periodicIndicator" minOccurs="0" maxOccurs="1" />
- <xs:element name="periodicDurationTime" type="xs:unsignedInt" minOccurs="0" maxOccurs="1" />
- <xs:element name="periodicIntervalTime" type="xs:unsignedInt" minOccurs="0" maxOccurs="1" />
- <xs:element name="stationaryIndication" type="m2m:stationaryIndication" minOccurs="0" maxOccurs="1" />
- <xs:element name="dataSizeIndicator" type="xs:positiveInteger" minOccurs="0" maxOccurs="1" />
- <xs:element name="validityTime" type="m2m:timestamp" minOccurs="0" maxOccurs="1" />
- <xs:element name="targetNetwork" type="m2m:listOfM2MID" minOccurs="0" maxOccurs="1" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="m2m:subscription" minOccurs="0" maxOccurs="unbounded" />
- <xs:element ref="m2m:scheduleAnnc" minOccurs="0" maxOccurs="1" />
- </xs:choice>
- </xs:choice>
- </xs:sequence>
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
- </xs:element>
-</xs:schema>
diff --git a/CDT-triggerRequest.xsd b/CDT-triggerRequest.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..e2d24b80f882af6b0346f4e9f18331f4527bd800
--- /dev/null
+++ b/CDT-triggerRequest.xsd
@@ -0,0 +1,64 @@
+<?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" 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="triggerRequest" substitutionGroup="m2m:sg_regularResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit common attributes from RegularResource Type -->
+ <xs:extension base="m2m:regularResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="M2M-Ext-ID" type="m2m:externalID" />
+ <xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientID" />
+ <xs:element name="triggerPurpose" type="m2m:triggerPurpose" />
+ <xs:element name="triggerPayloadSerialization" type="m2m:serializationType" />
+ <xs:element name="triggerStatus" type="m2m:triggerStatus" />
+ <xs:element name="triggerValidityTime" type="m2m:timestamp" minOccurs="0" />
+ <xs:element name="triggerInfoAE-ID" type="m2m:ID" minOccurs="0" />
+ <xs:element name="triggerInfoAddress" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0" />
+ <xs:element name="targetedResourceType" type="m2m:resourceType" 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>