Commit c357b810 authored by Wolfgang Granzow's avatar Wolfgang Granzow

Changes agreed at PRO#23 (first part)

see detailed list of CRs and changes in
PRO-2016-0226-PRO23_changes_of_XML_schemas_to_align_with_TS-0004
parent 7cd08164
<?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>
......@@ -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>
......@@ -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>
......@@ -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">
......
......@@ -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"/>
......
......@@ -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 &lt;group&gt; 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>
......@@ -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" />
......
......@@ -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" />
......
......@@ -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>
......@@ -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">
......
......@@ -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">
......
......@@ -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>
......
......@@ -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" />
......
......@@ -35,8 +35,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR