Commit 14d59ad6 authored by Wolfgang Granzow's avatar Wolfgang Granzow

Changes agreed at PRO#32.2 (Interim) meeting

See summary of changes in PRO-2018-0054
parent 9d8f9657
...@@ -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|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>
...@@ -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>
......
...@@ -775,9 +775,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -775,9 +775,21 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- cmdhNwAccessRule --> <!-- cmdhNwAccessRule -->
<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>
......
...@@ -23,39 +23,48 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -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" <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-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-subscription-v2_16_0.xsd"/>
<xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd" /> <xs:include schemaLocation="CDT-semanticDescriptor-v2_16_0.xsd"/>
<xs:element name="group" substitutionGroup="m2m:sg_announceableResource"> <xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType> <xs:complexType>
<xs:complexContent> <xs:complexContent>
<!-- Inherit common attributes for announceable Resources --> <!-- Inherit common attributes for announceable Resources -->
<xs:extension base="m2m:announceableResource"> <xs:extension base="m2m:announceableResource">
<xs:sequence> <xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources --> <!-- 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 --> <!-- Resource Specific Attributes -->
<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"
<xs:element name="groupName" type="xs:string" minOccurs="0" /> minOccurs="0"/>
<xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0" /> <xs:element name="groupName" type="xs:string" 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"/>
</xs:choice> </xs:choice>
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
...@@ -71,29 +80,33 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -71,29 +80,33 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announcedResource"> <xs:extension base="m2m:announcedResource">
<!-- 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"
<xs:element name="maxNrOfMembers" type="xs:positiveInteger" minOccurs="0" /> 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"
<xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0" /> minOccurs="0"/>
<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" /> <xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0"/>
<xs:element name="groupName" type="xs:string" minOccurs="0" /> <xs:element name="consistencyStrategy" type="m2m:consistencyStrategy"
<xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0" /> minOccurs="0"/>
<xs:element name="groupName" type="xs:string" minOccurs="0"/>
<!-- Child Resources --> <xs:element name="semanticSupportIndicator" type="xs:boolean" minOccurs="0"/>
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" /> <!-- Child Resources -->
<xs:choice minOccurs="1" maxOccurs="unbounded"> <xs:choice minOccurs="0" maxOccurs="1">
<xs:element ref="m2m:subscription" /> <xs:element name="childResource" type="m2m:childResourceRef"
<xs:element ref="m2m:semanticDescriptor" /> maxOccurs="unbounded"/>
<xs:element ref="m2m:semanticDescriptorAnnc" /> <xs:choice minOccurs="1" maxOccurs="unbounded">
</xs:choice> <xs:element ref="m2m:subscription"/>
</xs:choice> <xs:element ref="m2m:semanticDescriptor"/>
<xs:element ref="m2m:semanticDescriptorAnnc"/>
</xs:choice>
</xs:choice>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
......
...@@ -117,6 +117,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -117,6 +117,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- 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"/>
<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>
</xs:element> </xs:element>
......
...@@ -107,7 +107,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -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" /> <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" />
<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>
</xs:element> </xs:element>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment