From f082f0ecdec3eafc4e8b525d0143cf583fd96d7b Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 11 May 2020 14:33:08 +0200
Subject: [PATCH] XSD v2_16_0 baseline
---
CDT-commonTypes.xsd | 28 ++++++++---
CDT-enumerationTypes.xsd | 19 ++++++--
CDT-group.xsd | 97 ++++++++++++++++++++++-----------------
CDT-requestPrimitive.xsd | 3 ++
CDT-responsePrimitive.xsd | 5 +-
5 files changed, 99 insertions(+), 53 deletions(-)
diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index c1dbe8c..fca3fc8 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -177,11 +177,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
-
+ <xs:simpleType name="pointOfAccess">
+ <xs:restriction base="xs:anyURI">
+ <xs:pattern value="(http|HTTP|coap|COAP|mqtt|MQTT|ws|WS)(s|S)?://[\w/!#$^_\.+&\-:;=]+" />
+ </xs:restriction>
+ </xs:simpleType>
+
<xs:simpleType name="poaList">
<xs:restriction>
<xs:simpleType>
- <xs:list itemType="xs:string" />
+ <xs:list itemType="m2m:pointOfAccess" />
</xs:simpleType>
<xs:minLength value="1" />
</xs:restriction>
@@ -323,7 +328,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="scheduleEntry">
<xs:restriction base="xs:string">
<xs:pattern
- value="(([*]|[1-5]?\d([,-/][1-5]?\d)*)\s+){2}([*]|((1?\d|2[0-3])([,-/](1?\d|2[0-3]))*))\s+([*]|(([1-9]|1\d|2\d|3[01])([,-/]([1-9]|1\d|2\d|3[01]))*))\s+([*]|(([1-9]|1[0-2])([,-/]([1-9]|1[0-2]))*))\s+([*]|([0-6]([,-/][0-6])*))\s+([*]|([2-9]\d\d\d)(([,-]([2-9]\d\d\d)([/][\d]?[\d]?[\d]?[\d])?)*))" />
+ value="(([*]|[1-5]?\d([,\-/][1-5]?\d)*)\s+){2}([*]|((1?\d|2[0-3])([,\-/](1?\d|2[0-3]))*))\s+([*]|(([1-9]|1\d|2\d|3[01])([,\-/]([1-9]|1\d|2\d|3[01]))*))\s+([*]|(([1-9]|1[0-2])([,\-/]([1-9]|1[0-2]))*))\s+([*]|([0-6]([,\-/][0-6])*))\s+([*]|([2-9]\d\d\d)(([,-]([2-9]\d\d\d)([/][\d]?[\d]?[\d]?[\d])?)*))" />
</xs:restriction>
</xs:simpleType>
@@ -337,11 +342,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType>
<xs:simpleType name="listOfDuration">
- <list itemType="xs:duration" />
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="xs:duration" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
</xs:simpleType>
-
+
<xs:simpleType name="attributeList">
- <list itemType="xs:NCName" />
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="xs:NCName" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
</xs:simpleType>
<xs:simpleType name="resourceTypeList">
@@ -520,6 +535,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType>
</xs:element>
<xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
+ <xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index 602f73c..b5b7d24 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -775,9 +775,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- cmdhNwAccessRule -->
<xs:enumeration value="1018" />
<!-- cmdhBuffer -->
- <xs:enumeration value="1019" />
-
-
+ <xs:enumeration value="1019" />
+ <!-- registration -->
+ <xs:enumeration value="1020" />
+ <!-- dataCollection -->
+ <xs:enumeration value="1021" />
+ <!-- authenticationProfile -->
+ <xs:enumeration value="1022" />
+ <!-- myCertFileCred -->
+ <xs:enumeration value="1023" />
+ <!-- trustAnchorCred -->
+ <xs:enumeration value="1024" />
+ <!-- MAFClientRegCfg -->
+ <xs:enumeration value="1025" />
+ <!-- MEFClientRegCfg -->
+ <xs:enumeration value="1026" />
</xs:restriction>
</xs:simpleType>
@@ -1203,7 +1215,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="5" />
</xs:restriction>
</xs:simpleType>
-
</xs:schema>
diff --git a/CDT-group.xsd b/CDT-group.xsd
index 706cec0..c9fcbb8 100644
--- a/CDT-group.xsd
+++ b/CDT-group.xsd
@@ -23,39 +23,48 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
-->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
- xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://www.onem2m.org/xml/protocols"
+ xmlns:m2m="http://www.onem2m.org/xml/protocols"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="unqualified"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes.xsd" />
- <xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes.xsd"/>
+ <xs:include schemaLocation="CDT-subscription.xsd"/>
+ <xs:include schemaLocation="CDT-semanticDescriptor.xsd"/>
<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
<xs:complexContent>
<!-- Inherit common attributes for announceable Resources -->
<xs:extension base="m2m:announceableResource">
- <xs:sequence>
+ <xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
- <xs:element name="creator" type="m2m:ID" minOccurs="0" />
+ <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:nonNegativeInteger" />
- <xs:element name="maxNrOfMembers" type="xs:positiveInteger" />
- <xs:element name="memberIDs" type="m2m:listOfURIs" />
- <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
+ <xs:element name="memberType" type="m2m:memberType"/>
+ <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger"/>
+ <xs:element name="maxNrOfMembers" type="xs:positiveInteger"/>
+ <xs:element name="memberIDs">
+ <xs:simpleType>
+ <xs:list itemType="xs:anyURI"/>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs"
+ minOccurs="0"/>
<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" />
- <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0" />
-
+ <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy"
+ minOccurs="0"/>
+ <xs:element name="groupName" type="xs:string" minOccurs="0"/>
+ <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0"/>
+
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
+ <xs:element name="childResource" type="m2m:childResourceRef"
+ maxOccurs="unbounded"/>
<xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element ref="m2m:subscription" />
- <xs:element ref="m2m:semanticDescriptor" />
+ <xs:element ref="m2m:subscription"/>
+ <xs:element ref="m2m:semanticDescriptor"/>
</xs:choice>
</xs:choice>
</xs:sequence>
@@ -71,29 +80,33 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announcedResource">
<!-- Resource Specific Attributes -->
<xs:sequence>
- <xs:element name="memberType" type="m2m:memberType" minOccurs="0" />
- <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
- <xs:element name="maxNrOfMembers" type="xs:positiveInteger" minOccurs="0" />
+ <xs:element name="memberType" type="m2m:memberType" minOccurs="0"/>
+ <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger"
+ minOccurs="0"/>
+ <xs:element name="maxNrOfMembers" type="xs:positiveInteger" minOccurs="0"/>
<xs:element name="memberIDs" minOccurs="0">
- <xs:simpleType>
- <xs:list itemType="xs:anyURI" />
- </xs:simpleType>
- </xs:element>
- <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
- <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" />
- <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0" />
-
- <!-- Child Resources -->
- <xs:choice minOccurs="0" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
- <xs:choice minOccurs="1" maxOccurs="unbounded">
- <xs:element ref="m2m:subscription" />
- <xs:element ref="m2m:semanticDescriptor" />
- <xs:element ref="m2m:semanticDescriptorAnnc" />
- </xs:choice>
- </xs:choice>
+ <xs:simpleType>
+ <xs:list itemType="xs:anyURI"/>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs"
+ minOccurs="0"/>
+ <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"/>
+ <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0"/>
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef"
+ maxOccurs="unbounded"/>
+ <xs:choice minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="m2m:subscription"/>
+ <xs:element ref="m2m:semanticDescriptor"/>
+ <xs:element ref="m2m:semanticDescriptorAnnc"/>
+ </xs:choice>
+ </xs:choice>
</xs:sequence>
</xs:extension>
</xs:complexContent>
diff --git a/CDT-requestPrimitive.xsd b/CDT-requestPrimitive.xsd
index 7b3bf4a..b46c072 100644
--- a/CDT-requestPrimitive.xsd
+++ b/CDT-requestPrimitive.xsd
@@ -116,7 +116,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:element>
<!-- parameter "Token Request Indicator" -->
<xs:element name="tokenRequestIndicator" type="xs:boolean" minOccurs="0"/>
+ <!-- parameter "Release Version Indicator" -->
<xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
+ <!-- parameter "Vendor Information" -->
+ <xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/CDT-responsePrimitive.xsd b/CDT-responsePrimitive.xsd
index a60327f..8a6b445 100644
--- a/CDT-responsePrimitive.xsd
+++ b/CDT-responsePrimitive.xsd
@@ -107,7 +107,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="assignedTokenIdentifiers" type="m2m:dynAuthLocalTokenIdAssignments" minOccurs="0" />
<!-- parameter "Token Request Information -->
<xs:element name="tokenRequestInformation" type="m2m:dynAuthTokenReqInfo" minOccurs="0" />
- <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
+ <!-- parameter "Release Version Indicator" -->
+ <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
+ <!-- parameter "Vendor Information" -->
+ <xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
--
GitLab