diff --git a/CDT-commonTypes-v0_8_0.xsd b/CDT-commonTypes-v0_8_0.xsd
index 778c5f41ee53fa75558b26df50a3cae9635ba7e0..9251aaf8f7c01554b0ec8e43d4636e70f6fa8194 100644
--- a/CDT-commonTypes-v0_8_0.xsd
+++ b/CDT-commonTypes-v0_8_0.xsd
@@ -148,13 +148,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="ipv4">
+ <!-- <xs:simpleType name="ipv4">
<xs:restriction base="xs:token" />
</xs:simpleType>
<xs:simpleType name="ipv6">
<xs:restriction base="xs:token" />
- </xs:simpleType>
+ </xs:simpleType> -->
<xs:simpleType name="pOAList">
<xs:list itemType="xs:string" />
diff --git a/CDT-notification-v0_8_0.xsd b/CDT-notification-v0_8_0.xsd
index 9a5e7e77c4723ba7551e62e9ffa05d12ebe5601c..c9bbd28319c1a02e49deabdde22e24e87c3f05a4 100644
--- a/CDT-notification-v0_8_0.xsd
+++ b/CDT-notification-v0_8_0.xsd
@@ -25,6 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v0_8_0.xsd"/>
<!-- TODO: This "notification data object" does not comply (and does not need to comply) with the
generic <resourceType> specification conventions. One and only one instance of this data object is included
@@ -34,23 +35,31 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
an unbounded sequence of singleNotification elements only.
We need to add into TS-0004 information which corresponds to the <resourceType> tables shown in TS-0001.
-->
- <xs:element name="notification">
- <xs:complexType>
- <xs:choice>
- <!-- Resource Specific Attributes -->
- <xs:element name="aggregatedNotification" type="m2m:aggregatedNotification" minOccurs="0"/>
- <xs:element name="singleNotification" type="m2m:singleNotification" minOccurs="0"/>
- </xs:choice>
- </xs:complexType>
- </xs:element>
+ <xs:element name="notification" type="m2m:notification" />
+
+ <xs:element name="aggregatedNotification" type="m2m:aggregatedNotification" />
+
+ <!-- TODO: The element defined below cannot be denoted "responsePrimitive" as defined in Table 7.4.1.1.1-2 of TS-0004.
+ This causes conflict due to two global components with the same name. Whatever element name is used,
+ it introduces an extra wrapping level around the requestPrimitive object.
+ I guess this can be avoided only by allowing the m2m:responsePrimitive to be included into a
+ primitiveContent directly
+ -->
+ <xs:element name="notificationContent" >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="m2m:responsePrimitive" minOccurs="1" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
<xs:complexType name="aggregatedNotification">
<xs:sequence>
- <xs:element name="singleNotification" type="m2m:singleNotification" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element name="notification" type="m2m:notification" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="singleNotification">
+ <xs:complexType name="notification">
<xs:sequence>
<xs:element name="notificationEvent" type="m2m:notificationEventList" minOccurs="0"/>
<xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/>
@@ -69,7 +78,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="notificationEvent">
<xs:sequence>
- <xs:element name="representation" type="xs:string" minOccurs="0"/>
+ <xs:element name="representation" type="xs:anyType" minOccurs="0"/>
<xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0"/>
<xs:element name="operationMonitor" type="m2m:operationMonitorType" minOccurs="0"/>
</xs:sequence>
diff --git a/CDT-requestPrimitive-v0_8_0.xsd b/CDT-requestPrimitive-v0_8_0.xsd
index c4d362a8dbb1b2ff1673546397c5ce965f35b2fb..83e09234d01e2b7208842d351cb83e7137488c55 100644
--- a/CDT-requestPrimitive-v0_8_0.xsd
+++ b/CDT-requestPrimitive-v0_8_0.xsd
@@ -40,7 +40,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- parameter "From" -->
<xs:element name="from" type="m2m:ID" minOccurs="1"/>
<!-- parameter "Request Identifier" -->
- <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="0"/>
+ <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/>
<!-- parameter "ResourceType" -->
<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
<!-- parameter "Name" -->
@@ -64,7 +64,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- parameter "Result Content" -->
<xs:element name="resultContent" type="m2m:resultContent" minOccurs="0"/>
<!-- parameter "Event Category" -->
- <xs:element name="eventCategory" type="m2m:eventCatType" minOccurs="0"/>
+ <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0"/>
<!-- parameter "Delivery Aggregation" -->
<xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0"/>
<!-- parameter "Group Request Identifier" -->
@@ -73,12 +73,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
<!-- parameter "Discovery Result Type" -->
<xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
-
- <!-- TODO: Role is still included in TS-0004v081, it was removed in TS-0001. Proposal: remove it from XSD and TS-0004-->
- <!-- parameter "Role" -->
- <!-- <xs:element name="role" type="xs:string" minOccurs="0"/> -->
</xs:sequence>
</xs:complexType>
</xs:element>
+
+ <xs:element name="attributeList" type="m2m:attributeList" />
+
</xs:schema>
diff --git a/CDT-responsePrimitive-v0_8_0.xsd b/CDT-responsePrimitive-v0_8_0.xsd
index 593963f49876d48cae2ef034334d97fd38681abc..db3052a62d934c0bb57ecd82e04101b56bedef05 100644
--- a/CDT-responsePrimitive-v0_8_0.xsd
+++ b/CDT-responsePrimitive-v0_8_0.xsd
@@ -32,34 +32,43 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="responsePrimitive" >
<xs:complexType>
- <!-- TODO: check if the sequence of elements is adequate -->
<xs:sequence>
- <!-- parameter "To" -->
- <xs:element name="to" type="xs:anyURI" minOccurs="0"/>
- <!-- parameter "From" -->
- <xs:element name="from" type="m2m:ID" minOccurs="0"/>
+ <!-- Response Code and Status Code primitive parameters defined in TS-0001 have been merged into
+ Response Status Code in TS-0004 -->
+ <!-- TODO: Table 6.4.2-1 of TS-0004 needs to be corrected: "m2m:responseStatus" to be replaced by "m2m:responseStatusCode" -->
+ <!-- parameter "Response Status Code" -->
+ <xs:element name="responseStatusCode" type="m2m:responseStatusCode" minOccurs="1"/>
<!-- parameter "Request Identifier" -->
- <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="0"/>
+ <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/>
<!-- parameter "Content" (of the primitive) -->
<xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/>
+ <!-- parameter "To" -->
+ <xs:element name="to" type="m2m:ID" minOccurs="0"/>
+ <!-- parameter "From" -->
+ <xs:element name="from" type="m2m:ID" minOccurs="0"/>
<!-- parameter "Originating Timestamp" -->
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
<!-- parameter "Result Expiration Timestamp" -->
<xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0"/>
<!-- parameter "Event Category" -->
- <xs:element name="eventCategory" type="m2m:eventCatType" minOccurs="0"/>
-
- <!-- TODO: TS-0001 defines Response Code and Status Code primitive parameters rather than Response Status Code used in TS-0004 -->
- <!-- parameter "Response Status Code" -->
- <xs:element name="responseStatusCode" type="m2m:responseStatus" minOccurs="0"/>
-
- <!-- TODO: Pending Request primitive parameter is not defined in TS-0001 (and probably never was)
- Has it been defined by PRO WG? -->
- <!-- parameter "Pending Requests" -->
- <!-- TOTO: the data type for this parameter is currently undefined in TS-0004 -->
- <xs:element name="pendingRequests" type="xs:boolean" minOccurs="0"/>
+ <xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>
+
+ <xs:element name="resource" type="m2m:resourceWrapper" />
+
+ <xs:element name="URIlist" type="m2m:listOfURIs" />
+
+ <xs:element name="aggregatedResponse" type="m2m:aggregatedResponse" />
+
+
+ <xs:complexType name="aggregatedResponse">
+ <xs:sequence>
+ <xs:element ref="m2m:responsePrimitive" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+
</xs:schema>