Commit 0f85798e authored by Wolfgang Granzow's avatar Wolfgang Granzow

final updates befor PRO#15.1 call

parent 47139121
......@@ -74,16 +74,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
<<<<<<< HEAD
<!-- 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 the elements of insetOfAcrs (CR to TS-0004 for next PRO WG meeting)
accessControlRule, accessControlOriginators, accessControlOperations accessControlContexts,
accessControlWindow, accessControlIpAddresses, ipv4Addresses, ipv6Addresses, accessControlLocationRegion,
countryCode, circRegion" -->
=======
<!-- TODO: define short names for "setOfAcrs" and all its elements names (CR to TS-0004 for next PRO WG meeting) -->
>>>>>>> f4a7bf5333d1229c13e208e4b0f3c3eb485aca9b
<xs:complexType name="setOfAcrs">
<xs:sequence>
......
......@@ -80,7 +80,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="listOfM2MID">
<xs:list itemType="m2m:ID" />
</xs:simpleType>
<!-- auxiliary data type required to define "listOflongMin-1" below -->
<xs:simpleType name="longMin-1">
<xs:restriction base="xs:long">
......@@ -235,7 +235,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
<xs:element name="operationalExecutionTime" type="m2m:timestamp" minOccurs="0" />
<xs:element name="responseType" type="m2m:responseType" minOccurs="0" />
<xs:element name="responsePersistence" type="m2m:timestamp" minOccurs="0" />
<xs:element name="resultPersistence" type="m2m:timestamp" minOccurs="0" />
<xs:element name="resultContent" type="m2m:resultContent" minOccurs="0" />
<xs:element name="eventCategory" minOccurs="0">
<xs:complexType>
......
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