From 241a18c4d0b2368b51e10f72ca64717a4c384ac4 Mon Sep 17 00:00:00 2001 From: reinaortega <miguelangel.reinaortega@etsi.org> Date: Mon, 11 May 2020 09:27:30 +0200 Subject: [PATCH] XSD v1_10_0 baseline --- CDT-commonTypes.xsd | 14 ++++++++++---- CDT-enumerationTypes.xsd | 4 ++++ CDT-group.xsd | 2 +- CDT-subscription.xsd | 2 +- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd index c0bd3bc..462cc41 100644 --- a/CDT-commonTypes.xsd +++ b/CDT-commonTypes.xsd @@ -266,6 +266,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:minLength value="1" /> </xs:restriction> </xs:simpleType> + + <xs:simpleType name="resourceName"> + <xs:restriction base="xs:string" > + <xs:pattern value="[a-zA-Z0-9]([a-zA-Z0-9\.\-,_]*)" /> + </xs:restriction> + </xs:simpleType> <!--********************** --> <!-- oneM2M Complex Types --> @@ -461,7 +467,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:complexType name="mgmtLinkRef"> <xs:simpleContent> <xs:extension base="xs:anyURI"> - <xs:attribute name="name" type="xs:NCName" use="required" /> + <xs:attribute name="name" type="m2m:resourceName" use="required" /> <xs:attribute name="type" type="m2m:mgmtDefinition" use="required" /> </xs:extension> </xs:simpleContent> @@ -474,7 +480,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:complexType name="childResourceRef"> <xs:simpleContent> <xs:extension base="xs:anyURI"> - <xs:attribute name="name" type="xs:NCName" use="required" /> + <xs:attribute name="name" type="m2m:resourceName" use="required" /> <xs:attribute name="type" type="m2m:resourceType" use="required" /> </xs:extension> </xs:simpleContent> @@ -483,7 +489,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:complexType name="responseTypeInfo"> <xs:sequence> <xs:element name="responseTypeValue" type="m2m:responseType" /> - <xs:element name="notificationURI"> + <xs:element name="notificationURI" minOccurs="0" > <xs:simpleType> <xs:restriction> <xs:simpleType> @@ -526,7 +532,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="lastModifiedTime" type="m2m:timestamp" /> <xs:element name="labels" type="m2m:labels" minOccurs="0" /> </xs:sequence> - <xs:attribute name="resourceName" type="xs:NCName" use="required" /> + <xs:attribute name="resourceName" type="m2m:resourceName" use="required" /> </xs:complexType> <xs:complexType name="regularResource"> diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd index 646bbef..4229687 100644 --- a/CDT-enumerationTypes.xsd +++ b/CDT-enumerationTypes.xsd @@ -481,6 +481,8 @@ 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"> + <!-- STATUS_SUCCESS --> + <xs:enumeration value="0" /> <!-- STATUS_REQUEST_UNSUPPORTED --> <xs:enumeration value="1" /> <!-- STATUS_REQUEST DENIED --> @@ -537,6 +539,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:enumeration value="29" /> <!-- STATUS_INVALID_DEPLOYMENT_UNIT_UPDATE_VERSION_EXISTS --> <xs:enumeration value="30" /> + <!-- STATUS_NOT_FINISHED --> + <xs:enumeration value="31" /> </xs:restriction> </xs:simpleType> diff --git a/CDT-group.xsd b/CDT-group.xsd index c37652a..bf3d732 100644 --- a/CDT-group.xsd +++ b/CDT-group.xsd @@ -47,7 +47,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:simpleType> </xs:element> <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" /> - <xs:element name="memberTypeValidated" type="xs:boolean" /> + <xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0"/> <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" /> <xs:element name="groupName" type="xs:string" minOccurs="0" /> diff --git a/CDT-subscription.xsd b/CDT-subscription.xsd index 3421612..3ad4b0a 100644 --- a/CDT-subscription.xsd +++ b/CDT-subscription.xsd @@ -77,7 +77,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" /> <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="attribute" type="m2m:attributeList" minOccurs="0" maxOccurs="1" /> <xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="4" /> </xs:sequence> </xs:complexType> -- GitLab