Commit 696ba8d3 authored by Wolfgang Granzow's avatar Wolfgang Granzow

Updates 2015-01-27 by Wolfgang

parent a6e022dc
...@@ -54,7 +54,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -54,7 +54,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" /> <xs:element name="accessControlPolicyIDs" type="m2m:acpType" minOccurs="0" />
<xs:element name="cseType" type="m2m:cseTypeID" minOccurs="0" /> <xs:element name="cseType" type="m2m:cseTypeID" minOccurs="0" />
<xs:element name="CSE-ID" type="m2m:ID" /> <xs:element name="CSE-ID" type="m2m:ID" />
<!-- TODO: update TS-0004 to remove m2m:resourceTypeList -->
<xs:element name="supportedResourceType"> <xs:element name="supportedResourceType">
<xs:simpleType> <xs:simpleType>
<xs:list itemType="m2m:resourceType" /> <xs:list itemType="m2m:resourceType" />
......
...@@ -51,7 +51,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -51,7 +51,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:complexType name="externalId"> <xs:complexType name="externalID">
<xs:simpleContent> <xs:simpleContent>
<xs:extension base="xs:anyURI"> <xs:extension base="xs:anyURI">
</xs:extension> </xs:extension>
...@@ -179,7 +179,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -179,7 +179,7 @@ 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="triggerRecipientId"> <xs:simpleType name="triggerRecipientID">
<xs:restriction base="xs:unsignedInt" /> <xs:restriction base="xs:unsignedInt" />
</xs:simpleType> </xs:simpleType>
......
...@@ -30,8 +30,9 @@ ...@@ -30,8 +30,9 @@
<xs:complexContent> <xs:complexContent>
<xs:extension base="m2m:announceableResource"> <xs:extension base="m2m:announceableResource">
<xs:sequence> <xs:sequence>
<!-- Resource Specific Attributes --> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" /> <xs:element name="stateTag" type="xs:nonNegativeInteger" />
<!-- Resource Specific Attributes -->
<xs:element name="creator" type="m2m:ID" /> <xs:element name="creator" type="m2m:ID" />
<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
...@@ -64,14 +65,14 @@ ...@@ -64,14 +65,14 @@
<xs:complexContent> <xs:complexContent>
<xs:extension base="m2m:announcedResource"> <xs:extension base="m2m:announcedResource">
<xs:sequence> <xs:sequence>
<!-- Resource Specific Attributes --> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" /> <xs:element name="stateTag" type="xs:nonNegativeInteger" />
<!-- Resource Specific Attributes -->
<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="maxInstanceAge" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" /> <xs:element name="currentNrOfInstances" type="xs:nonNegativeInteger" />
<xs:element name="currentByteSize" type="xs:nonNegativeInteger" /> <xs:element name="currentByteSize" type="xs:nonNegativeInteger" />
<xs:element name="latest" type="xs:string" minOccurs="0" />
<xs:element name="locationID" type="xs:anyURI" minOccurs="0" /> <xs:element name="locationID" type="xs:anyURI" minOccurs="0" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
......
...@@ -36,14 +36,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -36,14 +36,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexContent> <xs:complexContent>
<xs:extension base="m2m:announceableSubordinateResource"> <xs:extension base="m2m:announceableSubordinateResource">
<xs:sequence> <xs:sequence>
<!-- Resource Specific Attributes --> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" /> <xs:element name="stateTag" type="xs:nonNegativeInteger" />
<!-- Resource Specific Attributes -->
<xs:element name="creator" type="m2m:ID" minOccurs="0" /> <xs:element name="creator" type="m2m:ID" minOccurs="0" />
<xs:element name="typeOfContent" type="xs:string" minOccurs="0" /> <xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
<xs:element name="contentSize" type="xs:nonNegativeInteger" /> <xs:element name="contentSize" type="xs:nonNegativeInteger" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
<xs:element name="content" type="xs:anyType" /> <xs:element name="content" type="xs:anyType" />
<xs:element name="encoding" type="m2m:encodingType" minOccurs="0" />
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
...@@ -55,13 +55,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -55,13 +55,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexContent> <xs:complexContent>
<xs:extension base="m2m:announcedSubordinateResource"> <xs:extension base="m2m:announcedSubordinateResource">
<xs:sequence> <xs:sequence>
<!-- Resource Specific Attributes --> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" /> <xs:element name="stateTag" type="xs:nonNegativeInteger" />
<xs:element name="typeOfContent" type="xs:string" minOccurs="0" /> <!-- Resource Specific Attributes -->
<xs:element name="contentInfo" type="m2m:contentInfo" minOccurs="0" />
<xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="contentSize" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" /> <xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
<xs:element name="content" type="xs:anyType" minOccurs="0" /> <xs:element name="content" type="xs:anyType" minOccurs="0" />
<xs:element name="encoding" type="m2m:encodingType" minOccurs="0" />
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
......
...@@ -37,8 +37,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -37,8 +37,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Inherit common attributes --> <!-- Inherit common attributes -->
<xs:extension base="m2m:regularResource"> <xs:extension base="m2m:regularResource">
<xs:sequence> <xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" />
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<!-- TODO: The type of source and target should match that of CSE-ID (i.e.they should have type m2m:ID) -->
<xs:element name="source" type="m2m:ID" /> <xs:element name="source" type="m2m:ID" />
<xs:element name="target" type="m2m:ID" /> <xs:element name="target" type="m2m:ID" />
<xs:element name="lifespan" type="m2m:timestamp" /> <xs:element name="lifespan" type="m2m:timestamp" />
......
...@@ -37,8 +37,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -37,8 +37,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announceableResource"> <xs:extension base="m2m:announceableResource">
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:sequence> <xs:sequence>
<xs:element name="creator" type="xs:anyURI" minOccurs="0" /> <xs:element name="creator" type="m2m:ID" minOccurs="0" />
<xs:element name="memberType" type="m2m:memberType" /> <xs:element name="memberType" type="m2m:memberType" />
<!-- TODO: data type xs:long is used in TS-0004 for currentNrOfMembers and maxNrOfMembers (unchanged in #662R02) -->
<xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" /> <xs:element name="currentNrOfMembers" type="xs:nonNegativeInteger" />
<xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" /> <xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" />
<xs:element name="memberIDs" type="m2m:listOfURIs" /> <xs:element name="memberIDs" type="m2m:listOfURIs" />
...@@ -69,6 +70,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -69,6 +70,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<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" />
<!-- TODO: data type xs:long is used in TS-0004 for currentNrOfMembers and maxNrOfMembers (unchanged in #662R02) -->
<xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="maxNrOfMembers" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="memberIDs" type="m2m:listOfURIs" minOccurs="0" /> <xs:element name="memberIDs" type="m2m:listOfURIs" minOccurs="0" />
<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" /> <xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
......
...@@ -49,8 +49,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -49,8 +49,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="pointOfAccess" type="m2m:pOAList" minOccurs="0" /> <xs:element name="pointOfAccess" type="m2m:pOAList" minOccurs="0" />
<xs:element name="CSEBase" type="xs:anyURI" /> <xs:element name="CSEBase" type="xs:anyURI" />
<xs:element name="CSE-ID" type="m2m:ID" /> <xs:element name="CSE-ID" type="m2m:ID" />
<xs:element name="M2M-Ext-ID" type="m2m:externalId" minOccurs="0" /> <xs:element name="M2M-Ext-ID" type="m2m:externalID" minOccurs="0" />
<xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientId" minOccurs="0" /> <xs:element name="Trigger-Recipient-ID" type="m2m:triggerRecipientID" minOccurs="0" />
<xs:element name="requestReachability" type="xs:boolean" /> <xs:element name="requestReachability" type="xs:boolean" />
<xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
......
...@@ -36,6 +36,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -36,6 +36,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Inherit common attributes --> <!-- Inherit common attributes -->
<xs:extension base="m2m:regularResource"> <xs:extension base="m2m:regularResource">
<xs:sequence> <xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" />
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="operation" type="m2m:operation" /> <xs:element name="operation" type="m2m:operation" />
<xs:element name="target" type="xs:anyURI" /> <xs:element name="target" type="xs:anyURI" />
......
...@@ -36,7 +36,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -36,7 +36,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announceableSubordinateResource"> <xs:extension base="m2m:announceableSubordinateResource">
<xs:sequence> <xs:sequence>
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" /> <!-- TODO: Editor's notes on multiplicity of 'scheduleElement' attribute: should be 1 -->
<xs:element name="scheduleElement" type="m2m:scheduleEntries" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
......
...@@ -66,14 +66,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -66,14 +66,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="eventNotificationCriteria"> <xs:complexType name="eventNotificationCriteria">
<xs:sequence> <xs:sequence>
<xs:element name="createdBefore" type="xs:dateTime" minOccurs="0" /> <xs:element name="createdBefore" type="m2m:timestamp" minOccurs="0" />
<xs:element name="createdAfter" type="xs:dateTime" minOccurs="0" /> <xs:element name="createdAfter" type="m2m:timestamp" minOccurs="0" />
<xs:element name="modifiedSince" type="xs:dateTime" minOccurs="0" /> <xs:element name="modifiedSince" type="m2m:timestamp" minOccurs="0" />
<xs:element name="unmodifiedSince" type="xs:dateTime" minOccurs="0" /> <xs:element name="unmodifiedSince" type="m2m:timestamp" minOccurs="0" />
<xs:element name="stateTagSmaller" type="xs:positiveInteger" minOccurs="0" /> <xs:element name="stateTagSmaller" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="stateTagBigger" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="stateTagBigger" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="expireBefore" type="xs:dateTime" minOccurs="0" /> <xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
<xs:element name="expireAfter" type="xs:dateTime" minOccurs="0" /> <xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" /> <xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0" maxOccurs="unbounded" /> <xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0" maxOccurs="unbounded" />
......
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