diff --git a/v1_10_0/CDT-commonTypes-v1_10_0.xsd b/v1_10_0/CDT-commonTypes-v1_10_0.xsd index 16d9ceb48131fca819fcb7974dc21e8226e0683e..9c5f8a79978f0d6722d71b6040e121f8106ed9cc 100644 --- a/v1_10_0/CDT-commonTypes-v1_10_0.xsd +++ b/v1_10_0/CDT-commonTypes-v1_10_0.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/v1_10_0/CDT-enumerationTypes-v1_10_0.xsd b/v1_10_0/CDT-enumerationTypes-v1_10_0.xsd index 646bbef406f9cc9fddeef748481e035c2305c60e..4229687fc6fe359d272b1d999b75324ef34f661d 100644 --- a/v1_10_0/CDT-enumerationTypes-v1_10_0.xsd +++ b/v1_10_0/CDT-enumerationTypes-v1_10_0.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/v1_10_0/CDT-group-v1_10_0.xsd b/v1_10_0/CDT-group-v1_10_0.xsd index b95963893de8a0cda447904f9eebe10ea54ae45b..4674eb3d41731f04c9c774010768a30c732d9587 100644 --- a/v1_10_0/CDT-group-v1_10_0.xsd +++ b/v1_10_0/CDT-group-v1_10_0.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/v1_10_0/CDT-subscription-v1_10_0.xsd b/v1_10_0/CDT-subscription-v1_10_0.xsd index 38feaab9a9375af360857bacf9a57578b6707198..ac8a604b4409cb80f06a987c2e20baa8d9645311 100644 --- a/v1_10_0/CDT-subscription-v1_10_0.xsd +++ b/v1_10_0/CDT-subscription-v1_10_0.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>