Commit fe852911 authored by Wolfgang Granzow's avatar Wolfgang Granzow

Final updates before PRO#15.1 call

parent 886ebe64
......@@ -76,7 +76,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- TODO: 1) final decision: Should some or all of the data types defined below go into CDT-Common Types
(and "m2m:accessControlOperations" into CDT-Enumerations) ?
2) define short names for "setOfAcrs" and all its elements names (CR to TS-0004 for next PRO WG meeting) -->
2) define short names for the elements of insetOfAcrs (CR to TS-0004 for next PRO WG meeting)
accessControlRule, accessControlOriginators, accessControlOperations accessControlContexts,
accessControlWindow, accessControlIpAddresses, ipv4Addresses, ipv6Addresses, accessControlLocationRegion,
countryCode, circRegion" -->
<xs:complexType name="setOfAcrs">
<xs:sequence>
......@@ -124,7 +127,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
<!-- TODO: mismatch with TS-0003 and TS-0004 where element is called accessControlLocationRegions" -->
<!-- TODO: mismatch with TS-0003 and TS-0004 where element is called "accessControlLocationRegions" -->
<!-- TODO: mismatch with TS-0004 where element has multiplicity [0..n] -->
<xs:element name="accessControlLocationRegion" type="m2m:locationRegion" minOccurs="0" />
</xs:sequence>
......
......@@ -38,7 +38,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence>
<!-- mgmtObj specialization-specific Attributes -->
<xs:element name="applicableEventCategory" type="m2m:listOfEventCatWithDef" />
<!-- TODO: confirm whether we should use xs:long (as in TS-0004) or m2m:longMin-1 for following 4 attributes -->
<xs:element name="defaultRequestExpTime" type="xs:long" /> <!-- units in milliseconds -->
<xs:element name="defaultResultExpTime" type="xs:long" /> <!-- units in milliseconds -->
<xs:element name="defaultOpExecTime" type="xs:long" /> <!-- units in milliseconds -->
......
......@@ -218,10 +218,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
<xs:element name="name" type="xs:string" minOccurs="0" />
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
<xs:element name="requestMessageExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
<xs:element name="requestExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
<xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
<xs:element name="operationalExecutionTime" type="m2m:timestamp" minOccurs="0" />
<xs:element name="responseMessageType" type="m2m:responseType" minOccurs="0" />
<xs:element name="responseType" type="m2m:responseType" minOccurs="0" />
<xs:element name="responsePersistence" type="m2m:timestamp" minOccurs="0" />
<xs:element name="resultContent" type="m2m:resultContent" minOccurs="0" />
<xs:element name="eventCategory" minOccurs="0">
......
......@@ -43,8 +43,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
<!-- TODO: verify that xs:string is really the best type for locationStatus -->
<xs:element name="locationStatus" type="xs:string" />
<!-- TODO: Data type changed from "xs:string" to "m2m:status". Table 7.3.10.1 3 of TS-0004 needs to be corrected -->
<xs:element name="locationStatus" type="m2m:status" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
......@@ -72,8 +72,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
<xs:element name="locationContainerName" type="xs:string" minOccurs="0" />
<!-- TODO: verify that xs:string is really the best type for locationStatus -->
<xs:element name="locationStatus" type="xs:string" minOccurs="0" />
<!-- TODO: Data type changed from "xs:string" to "m2m:status". Table 7.3.10.1 3 of TS-0004 needs to be corrected -->
<xs:element name="locationStatus" type="m2m:status" minOccurs="0" />
<!-- No Child Resources -->
</xs:sequence>
......
......@@ -45,7 +45,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
<!-- parameter "Name" -->
<xs:element name="name" type="xs:string" minOccurs="0"/>
<!-- TODO: data type m2m:primitiveContent needs to be agreed and added into commonTypes -->
<!-- parameter "Content" (of the primitive)-->
<xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/>
<!-- parameter "Originating Timestamp" -->
......
......@@ -56,7 +56,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" />
<xs:element ref="m2m:schedule"></xs:element>
<xs:element ref="m2m:schedule" />
</xs:choice>
</xs:sequence>
</xs:extension>
......
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