diff --git a/v2_5_0/instance1.xml b/v2_5_0/instance1.xml
new file mode 100644
index 0000000000000000000000000000000000000000..da0eb5b9339502cab09143fc14b67857e6d12f35
--- /dev/null
+++ b/v2_5_0/instance1.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<m2m:requestPrimitive xmlns:m2m="http://www.onem2m.org/xml/protocols"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.onem2m.org/xml/protocols file:/C:/Users/wgranzow/UserData/M2M/OneM2M/PRO/GitHub/oneM2M-schemas/v2_5_0/CDT-requestPrimitive-v2_5_0.xsd">
+ <operation>1</operation>
+ <to>http://www.oxygenxml.com/</to>
+ <from>http://www.oxygenxml.com/</from>
+ <requestIdentifier>requestIdentifier0</requestIdentifier>
+ <resourceType>1</resourceType>
+ <primitiveContent>
+ <m2m:attributeList>attributeList0</m2m:attributeList>
+ <m2m:attributeList>attributeList1</m2m:attributeList>
+ </primitiveContent>
+ <role>
+ </role>
+ <originatingTimestamp>00000101T000000</originatingTimestamp>
+ <requestExpirationTimestamp>00000101T000000</requestExpirationTimestamp>
+ <resultExpirationTimestamp>00000101T000000</resultExpirationTimestamp>
+ <operationExecutionTime>00000101T000000</operationExecutionTime>
+ <responseType>
+ <responseTypeValue>1</responseTypeValue>
+ <notificationURI></notificationURI>
+ </responseType>
+ <resultPersistence>00000101T000000</resultPersistence>
+ <resultContent>0</resultContent>
+ <eventCategory>2</eventCategory>
+ <deliveryAggregation>false</deliveryAggregation>
+ <groupRequestIdentifier>groupRequestIdentifier0</groupRequestIdentifier>
+ <filterCriteria>
+ <createdBefore>00000101T000000</createdBefore>
+ <createdAfter>00000101T000000</createdAfter>
+ <modifiedSince>00000101T000000</modifiedSince>
+ <unmodifiedSince>00000101T000000</unmodifiedSince>
+ <stateTagSmaller>50</stateTagSmaller>
+ <stateTagBigger>50</stateTagBigger>
+ <expireBefore>00000101T000000</expireBefore>
+ <expireAfter>00000101T000000</expireAfter>
+ <labels>labels0</labels>
+ <resourceType>1</resourceType>
+ <sizeAbove>50</sizeAbove>
+ <sizeBelow>50</sizeBelow>
+ <contentType>contentType0</contentType>
+ <contentType>contentType1</contentType>
+ <attribute>
+ <name>creator</name>
+ <value>CSEID1*
+ </value>
+ </attribute>
+ <attribute>
+ <name>name1</name>
+ <value>
+ </value>
+ </attribute>
+ <filterUsage>1</filterUsage>
+ <limit>50</limit>
+ <semanticsFilter>semanticsFilter0</semanticsFilter>
+ <semanticsFilter>semanticsFilter1</semanticsFilter>
+ </filterCriteria>
+ <discoveryResultType>1</discoveryResultType>
+</m2m:requestPrimitive>
diff --git a/v2_6_0/CDT-accessControlPolicy-v2_6_0.xsd b/v2_6_0/CDT-accessControlPolicy-v2_6_0.xsd
index fffa9a3f12b3bc4d616708b5ad9f8e56d052a0c9..b756bb3986aae9e18b5f502600bbf27a08a6939c 100644
--- a/v2_6_0/CDT-accessControlPolicy-v2_6_0.xsd
+++ b/v2_6_0/CDT-accessControlPolicy-v2_6_0.xsd
@@ -74,112 +74,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
-
- <xs:complexType name="setOfAcrs">
- <xs:sequence>
- <xs:element name="accessControlRule" type="m2m:accessControlRule" minOccurs="0"
- maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="accessControlRule">
- <xs:sequence>
- <xs:element name="accessControlOriginators" type="m2m:listOfURIs" />
-
- <!-- accessControlOperations defined as enumerated list 1 ... 63 -->
- <xs:element name="accessControlOperations" type="m2m:accessControlOperations" />
-
- <xs:element name="accessControlContexts" minOccurs="0" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="accessControlWindow" type="m2m:scheduleEntry" minOccurs="0" maxOccurs="unbounded" />
- <xs:element name="accessControlIpAddresses" minOccurs="0">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="ipv4Addresses" minOccurs="0" maxOccurs="1">
- <!-- space separated list of IPv4 addresses -->
- <xs:simpleType>
- <xs:restriction>
- <xs:simpleType>
- <xs:list itemType="m2m:ipv4" />
- </xs:simpleType>
- <xs:minLength value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="ipv6Addresses" minOccurs="0" maxOccurs="1">
- <!-- space separated list of IPv6 addresses -->
- <xs:simpleType>
- <xs:restriction>
- <xs:simpleType>
- <xs:list itemType="m2m:ipv6" />
- </xs:simpleType>
- <xs:minLength value="1"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element name="accessControlLocationRegion" type="m2m:locationRegion" minOccurs="0" />
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
+ <!-- m2m:setOfAcrs and m2m:accessControlRule are defined in the accessControlPolicy xsd file -->
<!-- locationRegion is defined in commonTypes -->
<!-- countryCode is defined in commonTypes -->
-
-
- <!-- Initial IPv4 and IPv6 address representation types were found here:
- http://lists.w3.org/Archives/Public/www-xml-schema-comments/2005OctDec/0138.html, CIDR suffix has been added -->
-
- <xs:simpleType name="ipv4">
- <xs:annotation>
- <xs:documentation> An IP version 4 address, with optional CIDR suffix in the range /0
- ... /32. </xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:token">
- <xs:pattern
- value="(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])(/([0-9]|[1-2][0-9]|3[0-2]))?"/>
- <xs:pattern value="[0-9A-Fa-f]{8}(/([0-9]|[1-2][0-9]|3[0-2]))?"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:simpleType name="ipv6">
- <xs:annotation>
- <xs:documentation> An IP version 6 address, based on RFC 1884, with optional CIDR suffix
- in the range /0 ... /128. </xs:documentation>
- </xs:annotation>
- <xs:restriction base="xs:token">
- <!-- Fully specified address -->
- <xs:pattern
- value="[0-9A-Fa-f]{1,4}(:[0-9A-Fa-f]{1,4}){7}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
- <!-- Double colon start -->
- <xs:pattern value=":(:[0-9A-Fa-f]{1,4}){1,7}"/>
- <!-- Double colon middle -->
- <xs:pattern
- value="([0-9A-Fa-f]{1,4}:){1,6}(:[0-9A-Fa-f]{1,4}){1}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
- <xs:pattern
- value="([0-9A-Fa-f]{1,4}:){1,5}(:[0-9A-Fa-f]{1,4}){1,2}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
- <xs:pattern
- value="([0-9A-Fa-f]{1,4}:){1,4}(:[0-9A-Fa-f]{1,4}){1,3}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
- <xs:pattern
- value="([0-9A-Fa-f]{1,4}:){1,3}(:[0-9A-Fa-f]{1,4}){1,4}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
- <xs:pattern
- value="([0-9A-Fa-f]{1,4}:){1,2}(:[0-9A-Fa-f]{1,4}){1,5}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
- <xs:pattern
- value="([0-9A-Fa-f]{1,4}:){1}(:[0-9A-Fa-f]{1,4}){1,6}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
- <!-- Double colon end -->
- <xs:pattern value="([0-9A-Fa-f]{1,4}:){1,7}:(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
- <!-- Embedded IPv4 addresses without CIDR suffix. Should IPv4 CIDR suffix be added?-->
- <xs:pattern
- value="((:(:0{1,4}){0,3}(:(0{1,4}|[fF]{4}))?)|(0{1,4}:(:0{1,4}){0,2}(:(0{1,4}|[fF]{4}))?)|((0{1,4}:){2}(:0{1,4})?(:(0{1,4}|[fF]{4}))?)|((0{1,4}:){3}(:(0{1,4}|[fF]{4}))?)|((0{1,4}:){4}(0{1,4}|[fF]{4})?)):(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])"/>
- <!-- The unspecified address -->
- <xs:pattern value="::(/0)?"/>
- </xs:restriction>
- </xs:simpleType>
-
+
</xs:schema>
diff --git a/v2_6_0/CDT-commonTypes-v2_6_0.xsd b/v2_6_0/CDT-commonTypes-v2_6_0.xsd
index 399d2078882fbd94d780bcb441290154687d11d9..e6309c91cf890f1272bd12893090bc05a871a40f 100644
--- a/v2_6_0/CDT-commonTypes-v2_6_0.xsd
+++ b/v2_6_0/CDT-commonTypes-v2_6_0.xsd
@@ -56,6 +56,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="requestID">
<xs:restriction base="xs:token" />
</xs:simpleType>
+
+ <xs:simpleType name="roleID">
+ <xs:restriction base="xs:NCName" />
+ </xs:simpleType>
+
+ <xs:simpleType name="tokenID">
+ <xs:restriction base="xs:NCName" />
+ </xs:simpleType>
<xs:simpleType name="nhURI">
<xs:restriction base="xs:anyURI" />
@@ -125,7 +133,56 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
- <!-- m2m:ipv4 and m2m:ipv6 and m2m:countryCode are defined in the CDT-accessControlPolicy file -->
+ <!-- ipv4 and ipv6 are defined in commonTypes -->
+ <!-- Initial IPv4 and IPv6 address representation types were found here:
+ http://lists.w3.org/Archives/Public/www-xml-schema-comments/2005OctDec/0138.html, CIDR suffix has been added -->
+
+ <xs:simpleType name="ipv4">
+ <xs:annotation>
+ <xs:documentation> An IP version 4 address, with optional CIDR suffix in the range /0
+ ... /32. </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:token">
+ <xs:pattern
+ value="(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])(/([0-9]|[1-2][0-9]|3[0-2]))?"/>
+ <xs:pattern value="[0-9A-Fa-f]{8}(/([0-9]|[1-2][0-9]|3[0-2]))?"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:simpleType name="ipv6">
+ <xs:annotation>
+ <xs:documentation> An IP version 6 address, based on RFC 1884, with optional CIDR suffix
+ in the range /0 ... /128. </xs:documentation>
+ </xs:annotation>
+ <xs:restriction base="xs:token">
+ <!-- Fully specified address -->
+ <xs:pattern
+ value="[0-9A-Fa-f]{1,4}(:[0-9A-Fa-f]{1,4}){7}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
+ <!-- Double colon start -->
+ <xs:pattern value=":(:[0-9A-Fa-f]{1,4}){1,7}"/>
+ <!-- Double colon middle -->
+ <xs:pattern
+ value="([0-9A-Fa-f]{1,4}:){1,6}(:[0-9A-Fa-f]{1,4}){1}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
+ <xs:pattern
+ value="([0-9A-Fa-f]{1,4}:){1,5}(:[0-9A-Fa-f]{1,4}){1,2}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
+ <xs:pattern
+ value="([0-9A-Fa-f]{1,4}:){1,4}(:[0-9A-Fa-f]{1,4}){1,3}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
+ <xs:pattern
+ value="([0-9A-Fa-f]{1,4}:){1,3}(:[0-9A-Fa-f]{1,4}){1,4}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
+ <xs:pattern
+ value="([0-9A-Fa-f]{1,4}:){1,2}(:[0-9A-Fa-f]{1,4}){1,5}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
+ <xs:pattern
+ value="([0-9A-Fa-f]{1,4}:){1}(:[0-9A-Fa-f]{1,4}){1,6}(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
+ <!-- Double colon end -->
+ <xs:pattern value="([0-9A-Fa-f]{1,4}:){1,7}:(/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?"/>
+ <!-- Embedded IPv4 addresses without CIDR suffix. Should IPv4 CIDR suffix be added?-->
+ <xs:pattern
+ value="((:(:0{1,4}){0,3}(:(0{1,4}|[fF]{4}))?)|(0{1,4}:(:0{1,4}){0,2}(:(0{1,4}|[fF]{4}))?)|((0{1,4}:){2}(:0{1,4})?(:(0{1,4}|[fF]{4}))?)|((0{1,4}:){3}(:(0{1,4}|[fF]{4}))?)|((0{1,4}:){4}(0{1,4}|[fF]{4})?)):(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])\.(25[0-5]|2[0-4][0-9]|[0-1]?[0-9]?[0-9])"/>
+ <!-- The unspecified address -->
+ <xs:pattern value="::(/0)?"/>
+ </xs:restriction>
+ </xs:simpleType>
+
<xs:simpleType name="poaList">
<xs:restriction>
@@ -358,6 +415,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<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:element name="filterOperation" type="xs:boolean" minOccurs="0" />
</xs:sequence>
</xs:complexType>
@@ -374,7 +432,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
- <!-- m2m:aggregatedNotification and m2m:Notification are in the Notification xsd file -->
+ <!-- m2m:aggregatedNotification and m2m:notification are in the CDT-notification xsd file -->
<!-- "actionStatus" is used across mgmtObj resources -->
<xs:complexType name="actionStatus">
@@ -484,13 +542,64 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- m2m:resourceWrapper is defined in the responsePrimitive xsd file -->
- <!-- m2m:accessControlRule and m2m:locationRegion are defined in the accessControlPolicy xsd file -->
+ <xs:complexType name="setOfAcrs">
+ <xs:sequence>
+ <xs:element name="accessControlRule" type="m2m:accessControlRule" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="accessControlRule">
+ <xs:sequence>
+ <xs:element name="accessControlOriginators" type="m2m:listOfURIs" />
+
+ <!-- accessControlOperations defined as enumerated list 1 ... 63 -->
+ <xs:element name="accessControlOperations" type="m2m:accessControlOperations" />
+
+ <xs:element name="accessControlContexts" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="accessControlWindow" type="m2m:scheduleEntry" minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="accessControlIpAddresses" minOccurs="0">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="ipv4Addresses" minOccurs="0" maxOccurs="1">
+ <!-- space separated list of IPv4 addresses -->
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:ipv4" />
+ </xs:simpleType>
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="ipv6Addresses" minOccurs="0" maxOccurs="1">
+ <!-- space separated list of IPv6 addresses -->
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:ipv6" />
+ </xs:simpleType>
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="accessControlLocationRegion" type="m2m:locationRegion" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="childResourceRef">
<xs:simpleContent>
<xs:extension base="xs:anyURI">
<xs:attribute name="name" type="xs:NCName" use="required" />
- <xs:attribute name="type" type="m2m:resourceType" use="required" />
+ <xs:attribute name="type" type="m2m:resourceType" use="required" />
+ <xs:attribute name="specializationID" type="xs:anyURI" use="optional" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
@@ -526,7 +635,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
- <!-- m2m:aggregatedResponse is in the ResponsePrimitive xsd file -->
+ <!-- m2m:aggregatedResponse is in the CDT-responsePrimitive xsd file -->
<xs:complexType name="contentRef">
<xs:sequence>
@@ -585,6 +694,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
+ <!-- m2m:securityInfo, m2m:dynAuthDasRequest, m2m:dynAuthDasRequest, m2m:dynAuthDasResponse, m2m:receiverE2ERandObject
+ m2m:eSPrimObject and m2m:dynAuthDasRequest are in the CDT-notification xsd file -->
+
<!-- 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
@@ -715,5 +827,28 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:extension>
</xs:complexContent>
</xs:complexType>
+
+ <xs:complexType name="flexContainerResource">
+ <xs:complexContent>
+ <xs:extension base="m2m:announceableResource">
+ <xs:sequence>
+ <xs:element name="containerDefinition" type="xs:anyURI" />
+ <xs:element name="creator" type="m2m:ID" minOccurs="0" />
+ <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+
+ <xs:complexType name="announcedFlexContainerResource">
+ <xs:complexContent>
+ <xs:extension base="m2m:announcedResource">
+ <xs:sequence>
+ <xs:element name="containerDefinition" type="xs:anyURI" />
+ <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
</xs:schema>
diff --git a/v2_6_0/CDT-container-v2_6_0.xsd b/v2_6_0/CDT-container-v2_6_0.xsd
index 3b5ffeb9be15bf384b785d2c02141247a162f535..73c5d43d6c46ff823703b23e2cbc57e74f73cc8c 100644
--- a/v2_6_0/CDT-container-v2_6_0.xsd
+++ b/v2_6_0/CDT-container-v2_6_0.xsd
@@ -36,17 +36,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexContent>
<xs:extension base="m2m:announceableResource">
<xs:sequence>
- <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
+ <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+ <xs:element name="creator" type="m2m:ID" minOccurs="0" />
<!-- Resource Specific Attributes -->
- <xs:element name="creator" type="m2m:ID" />
<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
<xs:element name="currentByteSize" type="xs:nonNegativeInteger" />
<xs:element name="locationID" type="xs:anyURI" minOccurs="0" />
- <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="disableRetrieval" type="xs:boolean" minOccurs="0" />
<!-- Child Resources -->
<xs:element name="latest" type="xs:anyURI" />
@@ -81,6 +82,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="currentByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="locationID" type="xs:anyURI" minOccurs="0" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="disableRetrieval" type="xs:boolean" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
diff --git a/v2_6_0/CDT-contentInstance-v2_6_0.xsd b/v2_6_0/CDT-contentInstance-v2_6_0.xsd
index 90761e6e3ba216e39780f1df3576fc65f5d0970a..259999c525c69a73c1975bddef531371ce6d4784 100644
--- a/v2_6_0/CDT-contentInstance-v2_6_0.xsd
+++ b/v2_6_0/CDT-contentInstance-v2_6_0.xsd
@@ -37,8 +37,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" />
- <!-- Resource Specific Attributes -->
<xs:element name="creator" type="m2m:ID" minOccurs="0" />
+ <!-- Resource Specific Attributes -->
<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"/>
diff --git a/v2_6_0/CDT-enumerationTypes-v2_6_0.xsd b/v2_6_0/CDT-enumerationTypes-v2_6_0.xsd
index 8a1f8014dacf8ec3318e7212a7786e489e892a7d..c2462df09dea3d84ceecc8033688f92b1d0e666a 100644
--- a/v2_6_0/CDT-enumerationTypes-v2_6_0.xsd
+++ b/v2_6_0/CDT-enumerationTypes-v2_6_0.xsd
@@ -80,14 +80,28 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="23" />
<!-- semanticDescriptor -->
<xs:enumeration value="24" />
- <!-- dynamicAuthorizationConsultation -->
+ <!-- notificationTargetMgmtPolicyRef -->
<xs:enumeration value="25" />
<!-- notificationTargetPolicy -->
<xs:enumeration value="26" />
- <!-- notificationTargetMgmtPolicyRef -->
- <xs:enumeration value="27" />
<!-- policyDeletionRules -->
- <xs:enumeration value="28" />
+ <xs:enumeration value="27" />
+ <!-- flexContainer -->
+ <xs:enumeration value="28" />
+ <!-- timeSeries -->
+ <xs:enumeration value="29" />
+ <!-- timeSeriesInstance -->
+ <xs:enumeration value="30" />
+ <!-- role -->
+ <xs:enumeration value="31" />
+ <!-- token -->
+ <xs:enumeration value="32" />
+ <!-- trafficCharacteristics -->
+ <xs:enumeration value="33" />
+ <!-- trafficPattern -->
+ <xs:enumeration value="34" />
+ <!-- dynamicAuthorizationConsultation -->
+ <xs:enumeration value="35" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
@@ -110,6 +124,18 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10018" />
<!-- semanticDescriptorAnnc -->
<xs:enumeration value="10024" />
+ <!-- flexContainerAnnc -->
+ <xs:enumeration value="10028" />
+ <!-- timeSeriesAnnc -->
+ <xs:enumeration value="10029" />
+ <!-- timeSeriesInstanceAnnc -->
+ <xs:enumeration value="10030" />
+ <!-- trafficCharacteristicsAnnc -->
+ <xs:enumeration value="10033" />
+ <!-- trafficPatternAnnc -->
+ <xs:enumeration value="10034" />
+ <!-- dynamicAuthorizationConsultationAnnc -->
+ <xs:enumeration value="10035" />
</xs:restriction>
</xs:simpleType>
@@ -335,6 +361,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:documentation>Used for memberType attribute in <group> resource.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
+ <!-- mixed -->
+ <xs:enumeration value="0" />
<!-- accessControlPolicy -->
<xs:enumeration value="1" />
<!-- AE -->
@@ -381,6 +409,30 @@ 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" />
+ <!-- notificationTargetMgmtPolicyRef -->
+ <xs:enumeration value="25" />
+ <!-- notificationTargetPolicy -->
+ <xs:enumeration value="26" />
+ <!-- policyDeletionRules -->
+ <xs:enumeration value="27" />
+ <!-- flexContainer -->
+ <xs:enumeration value="28" />
+ <!-- timeSeries -->
+ <xs:enumeration value="29" />
+ <!-- timeSeriesInstance -->
+ <xs:enumeration value="30" />
+ <!-- role -->
+ <xs:enumeration value="31" />
+ <!-- token -->
+ <xs:enumeration value="32" />
+ <!-- trafficCharacteristics -->
+ <xs:enumeration value="33" />
+ <!-- trafficPattern -->
+ <xs:enumeration value="34" />
+ <!-- dynamicAuthorizationConsultation -->
+ <xs:enumeration value="35" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
@@ -401,9 +453,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10016" />
<!-- scheduleAnnc -->
<xs:enumeration value="10018" />
-
- <!-- Mixed -->
- <xs:enumeration value="24" />
+ <!-- semanticDescriptorAnnc -->
+ <xs:enumeration value="10024" />
+ <!-- flexContainerAnnc -->
+ <xs:enumeration value="10028" />
+ <!-- timeSeriesAnnc -->
+ <xs:enumeration value="10029" />
+ <!-- timeSeriesInstanceAnnc -->
+ <xs:enumeration value="10030" />
+ <!-- trafficCharacteristicsAnnc -->
+ <xs:enumeration value="10033" />
+ <!-- trafficPatternAnnc -->
+ <xs:enumeration value="10034" />
+ <!-- dynamicAuthorizationConsultationAnnc -->
+ <xs:enumeration value="10035" />
</xs:restriction>
</xs:simpleType>
@@ -951,5 +1014,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
+
+ <!-- m2m:securityInfoType is defined in the CDT-notification xsd file -->
+
</xs:schema>
diff --git a/v2_6_0/CDT-eventConfig-v2_6_0.xsd b/v2_6_0/CDT-eventConfig-v2_6_0.xsd
index 1ad4de6161ec2d3eda825d80e4bdeaab74ecd676..1a22253ee0be35fc93f155c5e84c0721fcf6761e 100644
--- a/v2_6_0/CDT-eventConfig-v2_6_0.xsd
+++ b/v2_6_0/CDT-eventConfig-v2_6_0.xsd
@@ -35,8 +35,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Inherit common attributes -->
<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" minOccurs="0" />
<!-- Resource Specific Attributes -->
- <xs:element name="creator" type="m2m:ID" />
<xs:element name="eventID" type="xs:string" />
<xs:element name="eventType" type="m2m:eventType" />
<xs:element name="eventStart" type="m2m:timestamp" minOccurs="0" />
diff --git a/v2_6_0/CDT-group-v2_6_0.xsd b/v2_6_0/CDT-group-v2_6_0.xsd
index ad8b2b27f28f453fe0ca3ba63fd0dba76f2896c4..e68874dcc586b5a9a05469599f0d3b436bb1a1f8 100644
--- a/v2_6_0/CDT-group-v2_6_0.xsd
+++ b/v2_6_0/CDT-group-v2_6_0.xsd
@@ -36,9 +36,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
<xs:extension base="m2m:announceableResource">
- <!-- Resource Specific Attributes -->
- <xs:sequence>
- <xs:element name="creator" type="m2m:ID" minOccurs="0" />
+ <xs:sequence>
+ <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
+ <xs:element name="creator" type="m2m:ID" minOccurs="0" />
+ <!-- Resource Specific Attributes -->
<xs:element name="memberType" type="m2m:memberType" />
<xs:element name="currentNrOfMembers" type="xs:positiveInteger" />
<xs:element name="maxNrOfMembers" type="xs:positiveInteger" />
diff --git a/v2_6_0/CDT-notification-v2_6_0.xsd b/v2_6_0/CDT-notification-v2_6_0.xsd
index f716f415028354c6ddbdb6010d5fe4ad6d29acf3..294ea272d53b8f81004f8f5937b3290a06bfa292 100644
--- a/v2_6_0/CDT-notification-v2_6_0.xsd
+++ b/v2_6_0/CDT-notification-v2_6_0.xsd
@@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="notification" type="m2m:notification" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
-
+
<xs:complexType name="notification">
<xs:sequence>
<xs:element name="notificationEvent" minOccurs="0">
@@ -71,5 +71,108 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:element>
</xs:sequence>
</xs:complexType>
+
+ <xs:element name="securityInfo" type="m2m:securityInfo" />
+
+ <xs:complexType name="securityInfo">
+ <xs:sequence>
+ <xs:element name="securityInfoType" type="m2m:securityInfoType" minOccurs="0" />
+ <xs:element name="dasRequest" type="m2m:dynAuthDasRequest" minOccurs="0" />
+ <xs:element name="dasResponse" type="m2m:dynAuthDasResponse" minOccurs="0" />
+ <xs:element name="e2eRandObject" type="m2m:receiverE2ERandObject" minOccurs="0" />
+ <xs:element name="esprimObject" type="m2m:eSPrimObject" minOccurs="0" />
+ <xs:element name="escertkeMessage" type="xs:base64Binary" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:simpleType name="securityInfoType">
+ <xs:restriction base="xs:integer">
+ <!-- Dynamic Authorization Request -->
+ <xs:enumeration value="1" />
+ <!-- Dynamic Authorization Response -->
+ <xs:enumeration value="2" />
+ <!-- Receiver E2E Rand Object Request -->
+ <xs:enumeration value="3" />
+ <!-- Receiver E2E Rand Object Response -->
+ <xs:enumeration value="4" />
+ <!-- ESPrim Object -->
+ <xs:enumeration value="5" />
+ <!-- ESCertKE Message -->
+ <xs:enumeration value="6" />
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="dynAuthDasRequest">
+ <xs:sequence>
+ <xs:element name="originator" type="m2m:ID" minOccurs="1" />
+ <xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="1" />
+ <xs:element name="operation" type="m2m:operation" minOccurs="1" />
+ <xs:element name="originatorIP" minOccurs="0" >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="ipv4Address" type="m2m:ipv4" minOccurs="0" />
+ <xs:element name="ipv6Address" type="m2m:ipv6" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="originatorLocation" type="m2m:locationRegion" minOccurs="0" />
+ <xs:element name="originatorRoleIDs" minOccurs="0" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:roleID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="requestTimestamp" type="m2m:absRelTimestamp" minOccurs="0" />
+ <xs:element name="targetedResourceID" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="proposedPrivilegesLifetime" type="m2m:absRelTimestamp" minOccurs="0" />
+ <xs:element name="roleIDsFromACPs" minOccurs="0" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:roleID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="tokenIDs" minOccurs="0" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:tokenID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="dynAuthDasResponse">
+ <xs:sequence>
+ <xs:element name="dynamicACPInfo" minOccurs="0" >
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="grantedPrivileges" type="m2m:setOfAcrs" minOccurs="0" />
+ <xs:element name="privilegesLifetime" type="m2m:absRelTimestamp" minOccurs="0" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="tokens" minOccurs="0" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:dynAuthJWT" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
diff --git a/v2_6_0/CDT-notificationTargetMgmtPolicyRef-v2_6_0.xsd b/v2_6_0/CDT-notificationTargetMgmtPolicyRef-v2_6_0.xsd
index b4bf30c704cd799bac66680101947e28a3c0568e..c7f3f5d77458053d7c9c61d4987d38874b0c0bc9 100644
--- a/v2_6_0/CDT-notificationTargetMgmtPolicyRef-v2_6_0.xsd
+++ b/v2_6_0/CDT-notificationTargetMgmtPolicyRef-v2_6_0.xsd
@@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="notificationTargetURI" type="m2m:listOfURIs" minOccurs="0" />
- <xs:element name="notificationlPolicyID" type="m2m:listOfURIs" minOccurs="0" />
+ <xs:element name="notificationlPolicyID" type="xs:anyURI" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
diff --git a/v2_6_0/CDT-notificationTargetPolicy-v2_6_0.xsd b/v2_6_0/CDT-notificationTargetPolicy-v2_6_0.xsd
index 3db78bedbe723fce0c182a9152f4deafb8771456..5d1899b09008f4b560fa3a5ec516e6e129018328 100644
--- a/v2_6_0/CDT-notificationTargetPolicy-v2_6_0.xsd
+++ b/v2_6_0/CDT-notificationTargetPolicy-v2_6_0.xsd
@@ -36,11 +36,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Inherit common attributes -->
<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" minOccurs="0" />
<!-- 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">
diff --git a/v2_6_0/CDT-responsePrimitive-v2_6_0.xsd b/v2_6_0/CDT-responsePrimitive-v2_6_0.xsd
index 03f1ad98ba73b0069474a4a53838668cda119b2e..2ab443a650efd92974fe6a24bc6f7c54848c07f6 100644
--- a/v2_6_0/CDT-responsePrimitive-v2_6_0.xsd
+++ b/v2_6_0/CDT-responsePrimitive-v2_6_0.xsd
@@ -161,7 +161,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="aggregatedResponse">
- <xs:sequence>
+ <xs:sequence>
+ <xs:element name="resourceID" type="xs:anyURI" minOccurs="0"/>
<xs:element ref="m2m:responsePrimitive" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
diff --git a/v2_6_0/CDT-semanticDescriptor-v2_6_0.xsd b/v2_6_0/CDT-semanticDescriptor-v2_6_0.xsd
index c97f886ac3f46b62f8fc0f76c8723a4c15df707f..3578f94149f4fc227d656a64a9d4bebb0bfe5cf5 100644
--- a/v2_6_0/CDT-semanticDescriptor-v2_6_0.xsd
+++ b/v2_6_0/CDT-semanticDescriptor-v2_6_0.xsd
@@ -35,8 +35,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Inherit common attributes for announceable Resources -->
<xs:extension base="m2m:regularResource">
<xs:sequence>
- <!-- Resource Specific Attributes -->
+ <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
<xs:element name="creator" type="m2m:ID" minOccurs="0" />
+ <!-- Resource Specific Attributes -->
<xs:element name="descriptorRepresentation" type="m2m:descriptorRepresentation" minOccurs="0" />
<xs:element name="semanticOpExec" type="m2m:sparql" minOccurs="0" />
<xs:element name="descriptor" type="xs:base64Binary" />
diff --git a/v2_6_0/CDT-statsCollect-v2_6_0.xsd b/v2_6_0/CDT-statsCollect-v2_6_0.xsd
index 8ed215a77b4d54a857b9fc19542884625f4423df..07fe8714104cc42e2caaf5025508e4056c3a30f3 100644
--- a/v2_6_0/CDT-statsCollect-v2_6_0.xsd
+++ b/v2_6_0/CDT-statsCollect-v2_6_0.xsd
@@ -35,8 +35,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Inherit common attributes -->
<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" minOccurs="0" />
<!-- Resource Specific Attributes -->
- <xs:element name="creator" type="m2m:ID" />
<xs:element name="statsCollectID" type="xs:string" />
<xs:element name="collectingEntityID" type="m2m:ID" />
<xs:element name="collectedEntityID" type="m2m:ID" />
diff --git a/v2_6_0/CDT-statsConfig-v2_6_0.xsd b/v2_6_0/CDT-statsConfig-v2_6_0.xsd
index 6e8419718cada7bcb04f17b9fdc153ee1dd039d2..0004eb084a534a5b108983bb804633449a26a270 100644
--- a/v2_6_0/CDT-statsConfig-v2_6_0.xsd
+++ b/v2_6_0/CDT-statsConfig-v2_6_0.xsd
@@ -36,8 +36,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Inherit common attributes -->
<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" minOccurs="0" />
<!-- Resource Specific Attributes -->
- <xs:element name="creator" type="m2m:ID" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
diff --git a/v2_6_0/CDT-subscription-v2_6_0.xsd b/v2_6_0/CDT-subscription-v2_6_0.xsd
index d3674ff40358a05758847dc7e446c6ef925c1619..6595e1a2a016ed730425dbb147c49d663c377ffc 100644
--- a/v2_6_0/CDT-subscription-v2_6_0.xsd
+++ b/v2_6_0/CDT-subscription-v2_6_0.xsd
@@ -36,6 +36,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- 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" minOccurs="0" />
<!-- Resource Specific Attributes -->
<xs:element name="eventNotificationCriteria" type="m2m:eventNotificationCriteria" minOccurs="0" />
<xs:element name="expirationCounter" type="xs:positiveInteger" minOccurs="0" />
@@ -50,7 +52,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="latestNotify" type="xs:boolean" minOccurs="0" />
<xs:element name="notificationContentType" type="m2m:notificationContentType" />
<xs:element name="notificationEventCat" type="m2m:eventCat" minOccurs="0" />
- <xs:element name="creator" type="m2m:ID" minOccurs="0" />
<xs:element name="subscriberURI" type="xs:anyURI" minOccurs="0" />
<!-- Child Resources -->