Skip to content
Snippets Groups Projects
Commit f082f0ec authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

XSD v2_16_0 baseline

parent c2991c39
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
CDT-commonTypes.xsd
+ 22
− 6
View file @ f082f0ec
...@@ -177,11 +177,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -177,11 +177,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction> </xs:restriction>
</xs:simpleType> </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/!#$^_\.+&amp;\-:;=]+" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="poaList"> <xs:simpleType name="poaList">
<xs:restriction> <xs:restriction>
<xs:simpleType> <xs:simpleType>
<xs:list itemType="xs:string" /> <xs:list itemType="m2m:pointOfAccess" />
</xs:simpleType> </xs:simpleType>
<xs:minLength value="1" /> <xs:minLength value="1" />
</xs:restriction> </xs:restriction>
...@@ -323,7 +328,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -323,7 +328,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="scheduleEntry"> <xs:simpleType name="scheduleEntry">
<xs:restriction base="xs:string"> <xs:restriction base="xs:string">
<xs:pattern <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:restriction>
</xs:simpleType> </xs:simpleType>
...@@ -337,11 +342,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -337,11 +342,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="listOfDuration"> <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>
<xs:simpleType name="attributeList"> <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>
<xs:simpleType name="resourceTypeList"> <xs:simpleType name="resourceTypeList">
...@@ -520,6 +535,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -520,6 +535,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType> </xs:simpleType>
</xs:element> </xs:element>
<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:sequence>
</xs:complexType> </xs:complexType>
......
CDT-enumerationTypes.xsd
+ 15
− 4
View file @ f082f0ec
...@@ -776,8 +776,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -776,8 +776,20 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="1018" /> <xs:enumeration value="1018" />
<!-- cmdhBuffer --> <!-- 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:restriction>
</xs:simpleType> </xs:simpleType>
...@@ -1204,6 +1216,5 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -1204,6 +1216,5 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
</xs:schema> </xs:schema>
CDT-group.xsd
+ 55
− 42
View file @ f082f0ec
...@@ -23,9 +23,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -23,9 +23,11 @@ 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" <xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" targetNamespace="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> 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-commonTypes.xsd"/>
<xs:include schemaLocation="CDT-subscription.xsd"/> <xs:include schemaLocation="CDT-subscription.xsd"/>
...@@ -43,16 +45,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -43,16 +45,23 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="memberType" type="m2m:memberType"/> <xs:element name="memberType" type="m2m:memberType"/>
<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger"/> <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger"/>
<xs:element name="maxNrOfMembers" type="xs:positiveInteger"/> <xs:element name="maxNrOfMembers" type="xs:positiveInteger"/>
<xs:element name="memberIDs" type="m2m:listOfURIs" /> <xs:element name="memberIDs">
<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" 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="memberTypeValidated" type="xs:boolean" minOccurs="0"/>
<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" /> <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy"
minOccurs="0"/>
<xs:element name="groupName" type="xs:string" minOccurs="0"/> <xs:element name="groupName" type="xs:string" minOccurs="0"/>
<xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0"/> <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0"/>
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <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:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription"/> <xs:element ref="m2m:subscription"/>
<xs:element ref="m2m:semanticDescriptor"/> <xs:element ref="m2m:semanticDescriptor"/>
...@@ -72,22 +81,26 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -72,22 +81,26 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:sequence> <xs:sequence>
<xs:element name="memberType" type="m2m:memberType" minOccurs="0"/> <xs:element name="memberType" type="m2m:memberType" minOccurs="0"/>
<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger"
minOccurs="0"/>
<xs:element name="maxNrOfMembers" type="xs:positiveInteger" minOccurs="0"/> <xs:element name="maxNrOfMembers" type="xs:positiveInteger" minOccurs="0"/>
<xs:element name="memberIDs" minOccurs="0"> <xs:element name="memberIDs" minOccurs="0">
<xs:simpleType> <xs:simpleType>
<xs:list itemType="xs:anyURI"/> <xs:list itemType="xs:anyURI"/>
</xs:simpleType> </xs:simpleType>
</xs:element> </xs:element>
<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" /> <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs"
minOccurs="0"/>
<xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0"/> <xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0"/>
<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" /> <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy"
minOccurs="0"/>
<xs:element name="groupName" type="xs:string" minOccurs="0"/> <xs:element name="groupName" type="xs:string" minOccurs="0"/>
<xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0"/> <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0"/>
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <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:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription"/> <xs:element ref="m2m:subscription"/>
<xs:element ref="m2m:semanticDescriptor"/> <xs:element ref="m2m:semanticDescriptor"/>
......
CDT-requestPrimitive.xsd
+ 3
− 0
View file @ f082f0ec
...@@ -116,7 +116,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -116,7 +116,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:element> </xs:element>
<!-- parameter "Token Request Indicator" --> <!-- parameter "Token Request Indicator" -->
<xs:element name="tokenRequestIndicator" type="xs:boolean" minOccurs="0"/> <xs:element name="tokenRequestIndicator" type="xs:boolean" minOccurs="0"/>
<!-- parameter "Release Version Indicator" -->
<xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/> <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
<!-- parameter "Vendor Information" -->
<xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
......
CDT-responsePrimitive.xsd
+ 4
− 1
View file @ f082f0ec
...@@ -107,7 +107,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -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" /> <xs:element name="assignedTokenIdentifiers" type="m2m:dynAuthLocalTokenIdAssignments" minOccurs="0" />
<!-- parameter "Token Request Information --> <!-- parameter "Token Request Information -->
<xs:element name="tokenRequestInformation" type="m2m:dynAuthTokenReqInfo" minOccurs="0" /> <xs:element name="tokenRequestInformation" type="m2m:dynAuthTokenReqInfo" minOccurs="0" />
<!-- parameter "Release Version Indicator" -->
<xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/> <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
<!-- parameter "Vendor Information" -->
<xs:element name="vendorInformation" type="xs:string" minOccurs="0"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment