diff --git a/CDT-AE.xsd b/CDT-AE.xsd
index bd4e84603c7687ebc2f71dbaa82e26242c27d7e0..4f9759fa98856339fc204b8ff29b98ad99eed4e6 100644
--- a/CDT-AE.xsd
+++ b/CDT-AE.xsd
@@ -32,6 +32,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-accessControlPolicy.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
<xs:include schemaLocation="CDT-pollingChannel.xsd" />
+ <xs:include schemaLocation="CDT-schedule.xsd" />
<xs:element name="AE">
<xs:complexType>
@@ -57,6 +58,7 @@ 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:choice>
</xs:choice>
</xs:sequence>
@@ -91,7 +93,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:accessControlPolicy" />
<xs:element ref="m2m:accessControlPolicyAnnc" />
<xs:element ref="m2m:subscription" />
- <xs:element ref="m2m:pollingChannel" />
+ <xs:element ref="m2m:scheduleAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/CDT-areaNwkDeviceInfo.xsd b/CDT-areaNwkDeviceInfo.xsd
index 7364d6028942080df124c19362a729abee59c003..899951aec1efe88c59fca35e0abe406fbc229753 100644
--- a/CDT-areaNwkDeviceInfo.xsd
+++ b/CDT-areaNwkDeviceInfo.xsd
@@ -41,7 +41,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="areaNwkId" type="xs:anyURI" />
<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
- <xs:element name="status" type="xs:string" minOccurs="0" />
+ <xs:element name="devStatus" type="xs:string" minOccurs="0" />
<xs:element name="listOfNeighbors" type="m2m:listOfURIs" />
<!-- Child Resources -->
@@ -67,7 +67,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="areaNwkId" type="xs:anyURI" minOccurs="0" />
<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
- <xs:element name="status" type="xs:string" minOccurs="0" />
+ <xs:element name="devStatus" type="xs:string" minOccurs="0" />
<xs:element name="listOfNeighbors" type="m2m:listOfURIs" minOccurs="0" />
<!-- Child Resources -->
diff --git a/CDT-cmdhPolicy.xsd b/CDT-cmdhPolicy.xsd
index 16a7f192ef6d6b1518a3112dd4ac679a7e1d0d4f..b00a4da55c19bbff263e5e37efe352c321a8f53a 100644
--- a/CDT-cmdhPolicy.xsd
+++ b/CDT-cmdhPolicy.xsd
@@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:mgmtResource">
<xs:sequence>
<!-- mgmtObj specialization-specific Attributes -->
- <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" />
+ <xs:element name="cmdhPolicyName" type="xs:string" minOccurs="1" maxOccurs="1" />
<!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
the following children:
1 mgmtLink to an instance of resource type [cmdhDefaults],
diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index f6c1698a5145f5d42f25694ee0ecff97898194e0..126899863586d2a3d69233e41707faa1a2deeea8 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -62,7 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType>
<xs:simpleType name="acpType">
- <list itemType="xs:anyURI" />
+ <list itemType="m2m:ID" />
</xs:simpleType>
<xs:simpleType name="labels">
@@ -212,7 +212,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="to" type="xs:anyURI" />
<xs:element name="from" type="m2m:ID" />
<xs:element name="requestIdentifier" type="m2m:requestID" />
- <xs:element name="content" type="m2m:primitiveContent" minOccurs="0" />
+ <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0" />
<xs:element name="metaInformation" type="m2m:metaInformation" minOccurs="0" />
</xs:sequence>
</xs:complexType>
@@ -223,13 +223,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="metaInformation">
<xs:sequence>
<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
- <xs:element name="name" type="xs:string" minOccurs="0" />
+ <xs:element name="name" type="xs:NCName" minOccurs="0" />
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
<xs:element name="requestExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
<xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
<xs:element name="operationExecutionTime" type="m2m:timestamp" minOccurs="0" />
- <xs:element name="responseType" type="m2m:responseType" minOccurs="0" />
- <xs:element name="resultPersistence" type="m2m:timestamp" minOccurs="0" />
+ <xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0" />
+ <xs:element name="resultPersistence" type="xs:duration" minOccurs="0" />
<xs:element name="resultContent" type="m2m:resultContent" minOccurs="0" />
<xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
<xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" />
@@ -416,7 +416,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="responseTypeInfo">
<xs:sequence>
- <xs:element name="responseType" type="m2m:responseType" />
+ <xs:element name="responseTypeValue" type="m2m:responseType" />
<xs:element name="notificationURI" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
</xs:complexType>
@@ -427,7 +427,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence>
<xs:element name="responseStatusCode" type="m2m:responseStatusCode" />
<xs:element name="requestIdentifier" type="m2m:requestID" />
- <xs:element name="content" type="m2m:primitiveContent" minOccurs="0" />
+ <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0" />
<xs:element name="to" type="xs:anyURI" minOccurs="0" />
<xs:element name="from" type="m2m:ID" minOccurs="0" />
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
@@ -472,7 +472,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="announceTo" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="announcedAttribute" minOccurs="0">
<xs:simpleType>
- <xs:list itemType="xs:token" />
+ <xs:list itemType="xs:NCName" />
</xs:simpleType>
</xs:element>
</xs:sequence>
diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index 02f97bfaddd03409acba73715889eb08cec37e12..c94309bb8d9a9141b5bb8ef0bc07495438e23f2d 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -207,12 +207,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:documentation>Used in <request> </xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
- <!-- hierarchical -->
+ <!-- structured -->
<xs:enumeration value="1" />
- <!-- Non-hierarchical -->
+ <!-- unstructured -->
<xs:enumeration value="2" />
- <!-- cseID+resourceID -->
- <xs:enumeration value="3" />
</xs:restriction>
</xs:simpleType>
@@ -229,7 +227,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="2001" />
<!-- DELETED -->
<xs:enumeration value="2002" />
- <!-- CHANGED -->
+ <!-- UPDATED -->
<xs:enumeration value="2004" />
<!-- BAD_REQUEST -->
<xs:enumeration value="4000" />
@@ -277,7 +275,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="6011" />
<!-- MGMT_SESSION_CANNOT_BE_ESTABLISHED -->
<xs:enumeration value="6020" />
- <!-- MGMT_SESSION_ESTABLISHMENT _TIMEOUT -->
+ <!-- MGMT_SESSION_ESTABLISHMENT_TIMEOUT -->
<xs:enumeration value="6021" />
<!-- INVALID_CMDTYPE -->
<xs:enumeration value="6022" />
@@ -287,7 +285,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="6024" />
<!-- MGMT_ CONVERSION_ERROR -->
<xs:enumeration value="6025" />
- <!-- MGMT_ CANCELATION_FAILURE -->
+ <!-- MGMT_ CANCELLATION_FAILED -->
<xs:enumeration value="6026" />
<!-- ALREADY_COMPLETE -->
<xs:enumeration value="6028" />
@@ -528,27 +526,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:documentation></xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
- <!-- modifiedAttributes -->
+ <!-- all attributes -->
<xs:enumeration value="1" />
- <!-- wholeResource -->
+ <!-- modified attributes -->
<xs:enumeration value="2" />
- <!-- referenceOnly -->
+ <!-- ResourceID -->
<xs:enumeration value="3" />
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="resourceStatus">
+ <xs:simpleType name="notificationEventType">
<xs:annotation>
- <xs:documentation></xs:documentation>
+ <xs:documentation>Used in the notificationEventType element of eventNotificationCriteria attribute of subscruiption resource</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
- <!-- childCreated -->
+ <!-- Update of Resource -->
<xs:enumeration value="1" />
- <!-- childDeleted -->
+ <!-- Delete of Resource -->
<xs:enumeration value="2" />
- <!-- updated -->
+ <!-- Create of Direct Child Resource -->
<xs:enumeration value="3" />
- <!-- deleted -->
+ <!-- Delete of Direct Child Resource -->
<xs:enumeration value="4" />
</xs:restriction>
</xs:simpleType>
@@ -881,9 +879,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:documentation>Used in filterCriteria</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
- <!-- Discovery Criteria -->
+ <!-- Discovery -->
<xs:enumeration value="1" />
- <!-- Event Notification Criteria -->
+ <!-- Conditional Retrieval -->
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
diff --git a/CDT-firmware.xsd b/CDT-firmware.xsd
index f1646d36dbae4480455c0072342b882a613ccf2b..3e6ed3ec471714f9f1a4eeabc39844ff18679ae6 100644
--- a/CDT-firmware.xsd
+++ b/CDT-firmware.xsd
@@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:sequence>
<xs:element name="version" type="xs:string" />
- <xs:element name="name" type="xs:string" />
+ <xs:element name="firmwareName" type="xs:string" />
<xs:element name="URL" type="xs:anyURI" />
<xs:element name="update" type="xs:boolean" />
<xs:element name="updateStatus" type="m2m:actionStatus" />
@@ -62,7 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:sequence>
<xs:element name="version" type="xs:string" minOccurs="0" />
- <xs:element name="name" type="xs:string" minOccurs="0" />
+ <xs:element name="firmwareName" type="xs:string" minOccurs="0" />
<xs:element name="URL" type="xs:anyURI" minOccurs="0" />
<xs:element name="update" type="xs:boolean" minOccurs="0" />
<xs:element name="updateStatus" type="m2m:actionStatus" minOccurs="0" />
diff --git a/CDT-notification.xsd b/CDT-notification.xsd
index d5a280569056bf356b91076ccb427c5e22a2b8c3..635c479c6e24dc2e828353d1e2ec51159b0f0756 100644
--- a/CDT-notification.xsd
+++ b/CDT-notification.xsd
@@ -44,7 +44,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType >
<xs:sequence>
<xs:element name="representation" type="xs:anyType" minOccurs="0"/>
- <xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0"/>
<xs:element name="operationMonitor" minOccurs="0">
<xs:complexType>
<xs:sequence>
diff --git a/CDT-remoteCSE.xsd b/CDT-remoteCSE.xsd
index cf7647141906e2a9f0e0ba6b9ac7fbe04f21431f..a575abe1e4f3a06f902b3344fce9a8684eb83971 100644
--- a/CDT-remoteCSE.xsd
+++ b/CDT-remoteCSE.xsd
@@ -27,8 +27,6 @@ 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.xsd" />
-
- <xs:include schemaLocation="CDT-AE.xsd" />
<xs:include schemaLocation="CDT-container.xsd" />
<xs:include schemaLocation="CDT-group.xsd" />
<xs:include schemaLocation="CDT-accessControlPolicy.xsd" />
@@ -58,7 +56,6 @@ 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" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element ref="m2m:AE" />
<xs:element ref="m2m:container" />
<xs:element ref="m2m:group" />
<xs:element ref="m2m:accessControlPolicy" />
@@ -92,8 +89,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:nodeAnnc" />
- <xs:element ref="m2m:AE" />
- <xs:element ref="m2m:AEAnnc" />
<xs:element ref="m2m:container" />
<xs:element ref="m2m:containerAnnc" />
<xs:element ref="m2m:group" />
diff --git a/CDT-request.xsd b/CDT-request.xsd
index 925a900eb5ed826d66442babba897d9da86131dd..f99a9600c94ae4032c67685cfc813f4876d89577 100644
--- a/CDT-request.xsd
+++ b/CDT-request.xsd
@@ -44,7 +44,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="originator" type="m2m:ID" />
<xs:element name="requestID" type="m2m:requestID" />
<xs:element name="metaInformation" type="m2m:metaInformation" />
- <xs:element name="content" type="m2m:primitiveContent" />
+ <xs:element name="primitiveContent" type="m2m:primitiveContent" />
<xs:element name="requestStatus" type="m2m:requestStatus" />
<xs:element name="operationResult" type="m2m:operationResult" />
diff --git a/CDT-requestPrimitive.xsd b/CDT-requestPrimitive.xsd
index 2168b5e5cb1a3425755653bfb76ea843256becc1..45a90b09f8c1b462e93c8cd9d5d7d2cedf38a279 100644
--- a/CDT-requestPrimitive.xsd
+++ b/CDT-requestPrimitive.xsd
@@ -44,9 +44,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- parameter "ResourceType" -->
<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
<!-- parameter "Name" -->
- <xs:element name="name" type="xs:string" minOccurs="0"/>
- <!-- parameter "Content" (of the primitive)-->
- <xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/>
+ <xs:element name="name" type="xs:NCName" minOccurs="0"/>
+ <!-- parameter "Content" -->
+ <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/>
<!-- parameter "Originating Timestamp" -->
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
<!-- parameter "Request Expiration Timestamp" -->
diff --git a/CDT-responsePrimitive.xsd b/CDT-responsePrimitive.xsd
index f6fa97d9eacb303df3a4ba7a0fb1c69e0d968ff2..5532412d39cb059f23fb285574d1cf034a45e064 100644
--- a/CDT-responsePrimitive.xsd
+++ b/CDT-responsePrimitive.xsd
@@ -39,8 +39,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="responseStatusCode" type="m2m:responseStatusCode" minOccurs="1"/>
<!-- parameter "Request Identifier" -->
<xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/>
- <!-- parameter "Content" (of the primitive) -->
- <xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/>
+ <!-- parameter "Content" -->
+ <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/>
<!-- parameter "To" -->
<xs:element name="to" type="m2m:ID" minOccurs="0"/>
<!-- parameter "From" -->
diff --git a/CDT-software.xsd b/CDT-software.xsd
index b6fd129f3e3f059fbff309de8ca9da91b9c00a29..df8cd2ec7f5d0f02b4b71182e3e407f07b85a24b 100644
--- a/CDT-software.xsd
+++ b/CDT-software.xsd
@@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:sequence>
<xs:element name="version" type="xs:string" />
- <xs:element name="name" type="xs:string" />
+ <xs:element name="softwareName" type="xs:string" />
<xs:element name="URL" type="xs:anyURI" />
<xs:element name="install" type="xs:boolean" />
<xs:element name="uninstall" type="xs:boolean" />
@@ -66,7 +66,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes -->
<xs:sequence>
<xs:element name="version" type="xs:string" minOccurs="0" />
- <xs:element name="name" type="xs:string" minOccurs="0" />
+ <xs:element name="softwareName" type="xs:string" minOccurs="0" />
<xs:element name="URL" type="xs:anyURI" minOccurs="0" />
<xs:element name="install" type="xs:boolean" minOccurs="0" />
<xs:element name="uninstall" type="xs:boolean" minOccurs="0" />
diff --git a/CDT-subscription.xsd b/CDT-subscription.xsd
index 2fc3e33ee2e5e8f49d4b816c80adcffafcebddea..87b0cea17ca46427d20bd560e3785c97a33908c0 100644
--- a/CDT-subscription.xsd
+++ b/CDT-subscription.xsd
@@ -76,9 +76,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<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="resourceStatus" type="m2m:resourceStatus" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="operationMonitor" type="m2m:operation" minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="operationMonitor" type="m2m:operation" minOccurs="0" maxOccurs="5" />
<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="4" />
</xs:sequence>
</xs:complexType>