diff --git a/v2_16_0/CDT-commonTypes-v2_16_0.xsd b/v2_16_0/CDT-commonTypes-v2_16_0.xsd index dc4a93c2f1d04ed6b313d73d54adb38b96c7ee48..26905f2fc58a610437c50411f7c35bfb1e56b7f2 100644 --- a/v2_16_0/CDT-commonTypes-v2_16_0.xsd +++ b/v2_16_0/CDT-commonTypes-v2_16_0.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|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> @@ -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/v2_16_0/CDT-enumerationTypes-v2_16_0.xsd b/v2_16_0/CDT-enumerationTypes-v2_16_0.xsd index 602f73cb55efca0df71a1d10f8dcbb8e1417299f..5011b7cc24fa63eef15faef2cb4005e1b2a1c1c7 100644 --- a/v2_16_0/CDT-enumerationTypes-v2_16_0.xsd +++ b/v2_16_0/CDT-enumerationTypes-v2_16_0.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> diff --git a/v2_16_0/CDT-group-v2_16_0.xsd b/v2_16_0/CDT-group-v2_16_0.xsd index 15d782ada654d9b3776b8116616a9e76e536d35b..cd99f634aa050f6fc9b1552987b9f7d3d6a5c6ab 100644 --- a/v2_16_0/CDT-group-v2_16_0.xsd +++ b/v2_16_0/CDT-group-v2_16_0.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-v2_16_0.xsd" /> - <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd" /> - <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" /> + <xs:include schemaLocation="CDT-commonTypes-v2_16_0.xsd"/> + <xs:include schemaLocation="CDT-subscription-v2_16_0.xsd"/> + <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.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/v2_16_0/CDT-requestPrimitive-v2_16_0.xsd b/v2_16_0/CDT-requestPrimitive-v2_16_0.xsd index 8b875b64c6c7eb83af400b160b823ad13fea71ec..a5ae738a54334ff1867380a300b22cd74b0368fc 100644 --- a/v2_16_0/CDT-requestPrimitive-v2_16_0.xsd +++ b/v2_16_0/CDT-requestPrimitive-v2_16_0.xsd @@ -117,6 +117,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <!-- parameter "Token Request Indicator" --> <xs:element name="tokenRequestIndicator" type="xs:boolean" minOccurs="0"/> <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/> + <xs:element name="vendorInformation" type="xs:string" minOccurs="0"/> </xs:sequence> </xs:complexType> </xs:element> diff --git a/v2_16_0/CDT-responsePrimitive-v2_16_0.xsd b/v2_16_0/CDT-responsePrimitive-v2_16_0.xsd index 68a715e739fabe9ddab59ac70eb9b950d0cab04a..5cd2a97afcaab183a1059a85246e28ae091dce50 100644 --- a/v2_16_0/CDT-responsePrimitive-v2_16_0.xsd +++ b/v2_16_0/CDT-responsePrimitive-v2_16_0.xsd @@ -107,7 +107,8 @@ 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"/> + <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/> + <xs:element name="vendorInformation" type="xs:string" minOccurs="0"/> </xs:sequence> </xs:complexType> </xs:element>