Commit 1b429a3d authored by Peter Niblett's avatar Peter Niblett

Final CommonTypes tidyup

parent c0f533b0
......@@ -74,9 +74,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
<!-- 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) -->
<!-- TODO: define short names for "setOfAcrs" and all its elements names (CR to TS-0004 for next PRO WG meeting) -->
<xs:complexType name="setOfAcrs">
<xs:sequence>
......@@ -218,140 +216,4 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<!-- access control operations -->
<xs:simpleType name="accessControlOperations">
<xs:annotation>
<xs:documentation>Shall be considered for access control policy check by the
CSE</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- Create -->
<xs:enumeration value="1"/>
<!-- Retrieve -->
<xs:enumeration value="2"/>
<!-- Create + Retrieve -->
<xs:enumeration value="3"/>
<!-- Update -->
<xs:enumeration value="4"/>
<!-- Create + Update -->
<xs:enumeration value="5"/>
<!-- Retrieve + Update -->
<xs:enumeration value="6"/>
<!-- Create + Retrieve + Update -->
<xs:enumeration value="7"/>
<!-- Delete -->
<xs:enumeration value="8"/>
<!-- Create + Delete -->
<xs:enumeration value="9"/>
<!-- Retrieve + Delete -->
<xs:enumeration value="10"/>
<!-- Create + Retrieve + Delete -->
<xs:enumeration value="11"/>
<!-- Update + Delete -->
<xs:enumeration value="12"/>
<!-- Create + Update + Delete -->
<xs:enumeration value="13"/>
<!-- Retrieve + Update + Delete -->
<xs:enumeration value="14"/>
<!-- Create + Retrieve + Update + Delete -->
<xs:enumeration value="15"/>
<!-- Notify -->
<xs:enumeration value="16"/>
<!-- Create + Notify -->
<xs:enumeration value="17"/>
<!-- Retrieve + Notify -->
<xs:enumeration value="18"/>
<!-- Create + Retrieve + Notify -->
<xs:enumeration value="19"/>
<!-- Update + Notify -->
<xs:enumeration value="20"/>
<!-- Create + Update + Notify -->
<xs:enumeration value="21"/>
<!-- Retrieve + Update + Notify -->
<xs:enumeration value="22"/>
<!-- Create + Retrieve + Update -->
<xs:enumeration value="23"/>
<!-- Delete + Notify -->
<xs:enumeration value="24"/>
<!-- Create + Delete + Notify -->
<xs:enumeration value="25"/>
<!-- Retrieve + Delete + Notify -->
<xs:enumeration value="26"/>
<!-- Create + Retrieve + Delete + Notify -->
<xs:enumeration value="27"/>
<!-- Update + Delete + Notify -->
<xs:enumeration value="28"/>
<!-- Create + Update + Delete + Notify -->
<xs:enumeration value="29"/>
<!-- Retrieve + Update + Delete + Notify -->
<xs:enumeration value="30"/>
<!-- Create + Retrieve + Update + Delete + Notify -->
<xs:enumeration value="31"/>
<!-- Discover -->
<xs:enumeration value="32"/>
<!-- Create + Discover -->
<xs:enumeration value="33"/>
<!-- Retrieve + Discover -->
<xs:enumeration value="34"/>
<!-- Create + Retrieve + Discover -->
<xs:enumeration value="35"/>
<!-- Update + Discover -->
<xs:enumeration value="36"/>
<!-- Create + Update + Discover -->
<xs:enumeration value="37"/>
<!-- Retrieve + Update + Discover -->
<xs:enumeration value="38"/>
<!-- Create + Retrieve + Update + Discover -->
<xs:enumeration value="39"/>
<!-- Delete + Discover -->
<xs:enumeration value="40"/>
<!-- Create + Delete + Discover -->
<xs:enumeration value="41"/>
<!-- Retrieve + Delete + Discover -->
<xs:enumeration value="42"/>
<!-- Create + Retrieve + Delete + Discover -->
<xs:enumeration value="43"/>
<!-- Update + Delete + Discover -->
<xs:enumeration value="44"/>
<!-- Create + Update + Delete + Discover -->
<xs:enumeration value="45"/>
<!-- Retrieve + Update + Delete + Discover -->
<xs:enumeration value="46"/>
<!-- Create + Retrieve + Update + Delete + Discover -->
<xs:enumeration value="47"/>
<!-- Notify + Discover -->
<xs:enumeration value="48"/>
<!-- Create + Notify + Discover -->
<xs:enumeration value="49"/>
<!-- Retrieve + Notify + Discover -->
<xs:enumeration value="50"/>
<!-- Create + Retrieve + Notify + Discover -->
<xs:enumeration value="51"/>
<!-- Update + Notify + Discover -->
<xs:enumeration value="52"/>
<!-- Create + Update + Notify + Discover -->
<xs:enumeration value="53"/>
<!-- Retrieve + Update + Notify + Discover -->
<xs:enumeration value="54"/>
<!-- Create + Retrieve + Update + Discover -->
<xs:enumeration value="55"/>
<!-- Delete + Notify + Discover -->
<xs:enumeration value="56"/>
<!-- Create + Delete + Notify + Discover -->
<xs:enumeration value="57"/>
<!-- Retrieve + Delete + Notify + Discover -->
<xs:enumeration value="58"/>
<!-- Create + Retrieve + Delete + Notify + Discover -->
<xs:enumeration value="59"/>
<!-- Update + Delete + Notify + Discover -->
<xs:enumeration value="60"/>
<!-- Create + Update + Delete + Notify + Discover -->
<xs:enumeration value="61"/>
<!-- Retrieve + Update + Delete + Notify + Discover -->
<xs:enumeration value="62"/>
<!-- Create + Retrieve + Update + Delete + Notify + Discover -->
<xs:enumeration value="63"/>
</xs:restriction>
</xs:simpleType>
</xs:schema>
This diff is collapsed.
......@@ -718,6 +718,141 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<!-- access control operations -->
<xs:simpleType name="accessControlOperations">
<xs:annotation>
<xs:documentation>Shall be considered for access control policy check by the CSE</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- Create -->
<xs:enumeration value="1"/>
<!-- Retrieve -->
<xs:enumeration value="2"/>
<!-- Create + Retrieve -->
<xs:enumeration value="3"/>
<!-- Update -->
<xs:enumeration value="4"/>
<!-- Create + Update -->
<xs:enumeration value="5"/>
<!-- Retrieve + Update -->
<xs:enumeration value="6"/>
<!-- Create + Retrieve + Update -->
<xs:enumeration value="7"/>
<!-- Delete -->
<xs:enumeration value="8"/>
<!-- Create + Delete -->
<xs:enumeration value="9"/>
<!-- Retrieve + Delete -->
<xs:enumeration value="10"/>
<!-- Create + Retrieve + Delete -->
<xs:enumeration value="11"/>
<!-- Update + Delete -->
<xs:enumeration value="12"/>
<!-- Create + Update + Delete -->
<xs:enumeration value="13"/>
<!-- Retrieve + Update + Delete -->
<xs:enumeration value="14"/>
<!-- Create + Retrieve + Update + Delete -->
<xs:enumeration value="15"/>
<!-- Notify -->
<xs:enumeration value="16"/>
<!-- Create + Notify -->
<xs:enumeration value="17"/>
<!-- Retrieve + Notify -->
<xs:enumeration value="18"/>
<!-- Create + Retrieve + Notify -->
<xs:enumeration value="19"/>
<!-- Update + Notify -->
<xs:enumeration value="20"/>
<!-- Create + Update + Notify -->
<xs:enumeration value="21"/>
<!-- Retrieve + Update + Notify -->
<xs:enumeration value="22"/>
<!-- Create + Retrieve + Update -->
<xs:enumeration value="23"/>
<!-- Delete + Notify -->
<xs:enumeration value="24"/>
<!-- Create + Delete + Notify -->
<xs:enumeration value="25"/>
<!-- Retrieve + Delete + Notify -->
<xs:enumeration value="26"/>
<!-- Create + Retrieve + Delete + Notify -->
<xs:enumeration value="27"/>
<!-- Update + Delete + Notify -->
<xs:enumeration value="28"/>
<!-- Create + Update + Delete + Notify -->
<xs:enumeration value="29"/>
<!-- Retrieve + Update + Delete + Notify -->
<xs:enumeration value="30"/>
<!-- Create + Retrieve + Update + Delete + Notify -->
<xs:enumeration value="31"/>
<!-- Discover -->
<xs:enumeration value="32"/>
<!-- Create + Discover -->
<xs:enumeration value="33"/>
<!-- Retrieve + Discover -->
<xs:enumeration value="34"/>
<!-- Create + Retrieve + Discover -->
<xs:enumeration value="35"/>
<!-- Update + Discover -->
<xs:enumeration value="36"/>
<!-- Create + Update + Discover -->
<xs:enumeration value="37"/>
<!-- Retrieve + Update + Discover -->
<xs:enumeration value="38"/>
<!-- Create + Retrieve + Update + Discover -->
<xs:enumeration value="39"/>
<!-- Delete + Discover -->
<xs:enumeration value="40"/>
<!-- Create + Delete + Discover -->
<xs:enumeration value="41"/>
<!-- Retrieve + Delete + Discover -->
<xs:enumeration value="42"/>
<!-- Create + Retrieve + Delete + Discover -->
<xs:enumeration value="43"/>
<!-- Update + Delete + Discover -->
<xs:enumeration value="44"/>
<!-- Create + Update + Delete + Discover -->
<xs:enumeration value="45"/>
<!-- Retrieve + Update + Delete + Discover -->
<xs:enumeration value="46"/>
<!-- Create + Retrieve + Update + Delete + Discover -->
<xs:enumeration value="47"/>
<!-- Notify + Discover -->
<xs:enumeration value="48"/>
<!-- Create + Notify + Discover -->
<xs:enumeration value="49"/>
<!-- Retrieve + Notify + Discover -->
<xs:enumeration value="50"/>
<!-- Create + Retrieve + Notify + Discover -->
<xs:enumeration value="51"/>
<!-- Update + Notify + Discover -->
<xs:enumeration value="52"/>
<!-- Create + Update + Notify + Discover -->
<xs:enumeration value="53"/>
<!-- Retrieve + Update + Notify + Discover -->
<xs:enumeration value="54"/>
<!-- Create + Retrieve + Update + Discover -->
<xs:enumeration value="55"/>
<!-- Delete + Notify + Discover -->
<xs:enumeration value="56"/>
<!-- Create + Delete + Notify + Discover -->
<xs:enumeration value="57"/>
<!-- Retrieve + Delete + Notify + Discover -->
<xs:enumeration value="58"/>
<!-- Create + Retrieve + Delete + Notify + Discover -->
<xs:enumeration value="59"/>
<!-- Update + Delete + Notify + Discover -->
<xs:enumeration value="60"/>
<!-- Create + Update + Delete + Notify + Discover -->
<xs:enumeration value="61"/>
<!-- Retrieve + Update + Delete + Notify + Discover -->
<xs:enumeration value="62"/>
<!-- Create + Retrieve + Update + Delete + Notify + Discover -->
<xs:enumeration value="63"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="SRole-ID">
<xs:restriction base="xs:token">
<!-- Software Management -->
......
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