From 09eeedcbe9c0b73fe864807c83ccd0b69825aa61 Mon Sep 17 00:00:00 2001 From: reinaortega <miguelangel.reinaortega@etsi.org> Date: Mon, 11 May 2020 14:37:25 +0200 Subject: [PATCH] XSD v2_20_0 baseline --- CDT-commonTypes.xsd | 4 ++-- CDT-delivery.xsd | 2 +- CDT-enumerationTypes.xsd | 4 +++- CDT-request.xsd | 2 +- CDT-requestPrimitive.xsd | 4 ++-- CDT-timeSeries.xsd | 4 ++-- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd index f544a64..090cb6d 100644 --- a/CDT-commonTypes.xsd +++ b/CDT-commonTypes.xsd @@ -491,9 +491,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" /> <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" /> <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" /> - <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0" /> + <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0" /> <xs:element name="roleIDs" minOccurs="0"> - <xs:simpleType> + <xs:simpleType> <xs:restriction> <xs:simpleType> <xs:list itemType="m2m:roleID" /> diff --git a/CDT-delivery.xsd b/CDT-delivery.xsd index f5e8bc9..7e8b5e8 100644 --- a/CDT-delivery.xsd +++ b/CDT-delivery.xsd @@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:extension base="m2m:regularResource"> <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="source" type="m2m:ID" /> <xs:element name="target" type="m2m:ID" /> diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd index bcac57c..6467b4e 100644 --- a/CDT-enumerationTypes.xsd +++ b/CDT-enumerationTypes.xsd @@ -242,7 +242,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> - <xs:simpleType name="discResType"> + <xs:simpleType name="desIdResType"> <xs:annotation> <xs:documentation>Used in <request> </xs:documentation> </xs:annotation> @@ -319,6 +319,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:enumeration value="4116" /> <!-- ORIGINATOR_HAS_ALREADY_REGISTERED --> <xs:enumeration value="4117" /> + <!-- SPECIALIZATION_SCHEMA_NOT_FOUND --> + <xs:enumeration value="4124" /> <!-- INTERNAL_SERVER_ERROR --> <xs:enumeration value="5000" /> <!-- NOT_IMPLEMENTED --> diff --git a/CDT-request.xsd b/CDT-request.xsd index 7c5e31f..ca7a6f4 100644 --- a/CDT-request.xsd +++ b/CDT-request.xsd @@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:extension base="m2m:regularResource"> <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="operation" type="m2m:operation" /> <xs:element name="target" type="xs:anyURI" /> diff --git a/CDT-requestPrimitive.xsd b/CDT-requestPrimitive.xsd index b46c072..bdca05b 100644 --- a/CDT-requestPrimitive.xsd +++ b/CDT-requestPrimitive.xsd @@ -79,8 +79,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/> <!-- parameter "Filter Criteria" --> <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/> - <!-- parameter "Discovery Result Type" --> - <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/> + <!-- parameter "Desired Identifier Result Type" --> + <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0"/> <!-- parameter "Tokens" --> <xs:element name="tokens" minOccurs="0"> <xs:simpleType> diff --git a/CDT-timeSeries.xsd b/CDT-timeSeries.xsd index b79bd36..9b833f6 100644 --- a/CDT-timeSeries.xsd +++ b/CDT-timeSeries.xsd @@ -38,8 +38,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:extension base="m2m:announceableResource"> <xs:sequence> <!-- 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" /> + <!-- Resource Specific Attributes --> <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" /> @@ -74,7 +74,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:extension base="m2m:announcedResource"> <xs:sequence> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources --> - <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" /> + <!-- Resource Specific Attributes --> <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" /> -- GitLab