Commit f4a2e2bb authored by Peter Niblett's avatar Peter Niblett

enumeration tidyup

parent a496fc43
This diff is collapsed.
......@@ -68,14 +68,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="17" />
<!-- schedule -->
<xs:enumeration value="18" />
<!-- serviceSubscribedAppRule -->
<xs:enumeration value="19" />
<!-- serviceSubscribedNode -->
<xs:enumeration value="19" />
<!-- statsCollect -->
<xs:enumeration value="20" />
<!-- statsConfig -->
<!-- statsCollect -->
<xs:enumeration value="21" />
<!-- subscription -->
<!-- statsConfig -->
<xs:enumeration value="22" />
<!-- subscription -->
<xs:enumeration value="23" />
<!-- accessControlPolicyAnnc -->
<xs:enumeration value="10001" />
<!-- AEAnnc -->
......@@ -127,7 +129,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="eventCatType">
<xs:simpleType name="stdEventCats">
<xs:annotation>
<xs:documentation>Used for ec parameter in request and eventCat attribute of &lt;delivery&gt; resource and cmdh
policy resource types.</xs:documentation>
......@@ -146,7 +148,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="operation">
<xs:annotation>
<xs:documentation>Used for rt parameter in request and operation attribute in &lt;request&gt; resource
<xs:documentation>Used for Operation parameter in request and operation attribute in &lt;request&gt; resource as well as resource as well as operationMonitor
</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
......@@ -200,26 +202,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="resultContent">
<xs:annotation>
<xs:documentation>Used for rc parameter in request.</xs:documentation>
<xs:documentation>Used for Result Content parameter in request.</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- Nothing -->
<xs:enumeration value="0" />
<!-- Attributes -->
<xs:enumeration value="1" />
<!-- Child Resources -->
<xs:enumeration value="2" />
<!-- Attributes + Child Resources -->
<xs:enumeration value="3" />
<!-- Original Resources -->
<xs:enumeration value="2" />
<!-- Attributes + Child Resource References -->
<xs:enumeration value="3" />
<!-- Child Resources -->
<xs:enumeration value="4" />
<!-- TODO: add child resource reference options (needs CR to TS0004) -->
<!-- Original Resource -->
<xs:enumeration value="5" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="discResType">
<xs:annotation>
<xs:documentation></xs:documentation>
<xs:documentation>Used in &lt;request&gt; </xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- hierarchical -->
......@@ -231,8 +234,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<!-- TODO: to be defined (needs CR) -->
<xs:simpleType name="statusCode">
<!-- TODO: to be added) -->
<xs:simpleType name="responseStatusCode">
<xs:annotation>
<xs:documentation></xs:documentation>
</xs:annotation>
......@@ -251,7 +254,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<!-- TODO: Does this need to be different from m2m:resourceType? Can we remove it? (needs CR) -->
<xs:simpleType name="memberType">
<xs:annotation>
<xs:documentation>Used for memberType attribute in &lt;group&gt; resource.</xs:documentation>
......@@ -273,36 +275,37 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="7" />
<!-- execInstance -->
<xs:enumeration value="8" />
<!-- fanOutPoint -->
<!-- group -->
<xs:enumeration value="9" />
<!-- Group -->
<!-- locationPolicy -->
<xs:enumeration value="10" />
<!-- localPolicy --> <!-- TODO: shouldn't this be locationPolicy ? -->
<xs:enumeration value="11" />
<!-- m2mServiceSubscription -->
<xs:enumeration value="12" />
<xs:enumeration value="11" />
<!-- mgmtCmd -->
<xs:enumeration value="13" />
<xs:enumeration value="12" />
<!-- mgmtObj -->
<xs:enumeration value="13" />
<!-- node -->
<xs:enumeration value="14" />
<!-- Node -->
<!-- pollingChannel -->
<xs:enumeration value="15" />
<!-- nodeInfo -->
<!-- remoteCSE -->
<xs:enumeration value="16" />
<!-- pollingChannel -->
<!-- request -->
<xs:enumeration value="17" />
<!-- remoteCSE -->
<xs:enumeration value="18" />
<!-- Request -->
<xs:enumeration value="19" />
<!-- Schedule -->
<xs:enumeration value="20" />
<!-- statsCollect -->
<xs:enumeration value="21" />
<!-- statsConfig -->
<xs:enumeration value="22" />
<!-- Subscription -->
<xs:enumeration value="23" />
<!-- schedule -->
<xs:enumeration value="18" />
<!-- serviceSubscribedAppRule -->
<xs:enumeration value="19" />
<!-- serviceSubscribedNode -->
<xs:enumeration value="20" />
<!-- statsCollect -->
<xs:enumeration value="21" />
<!-- statsConfig -->
<xs:enumeration value="22" />
<!-- subscription -->
<xs:enumeration value="23" />
<!-- Mixed -->
<xs:enumeration value="24" />
</xs:restriction>
......@@ -491,33 +494,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
<!--TODO: resolve the name clash here - needs CR -->
<xs:simpleType name="operationMonitor">
<xs:annotation>
<xs:documentation></xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<!-- Create -->
<xs:enumeration value="1" />
<!-- Retrieve -->
<xs:enumeration value="2" />
<!-- Update -->
<xs:enumeration value="3" />
<!-- Delete -->
<xs:enumeration value="4" />
</xs:restriction>
</xs:simpleType>
<!-- TODO: Fill in the details -->
<xs:simpleType name="attribute">
<xs:annotation>
<xs:documentation></xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
<xs:enumeration value="22" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="status">
<xs:annotation>
<xs:documentation>This is used for [software], [firmware] resource.</xs:documentation>
......@@ -693,11 +670,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:simpleType name="encodingType">
<xs:restriction base="xs:integer">
<!-- No Transfer Encoding -->
<!-- Plain -->
<xs:enumeration value="0" />
<!-- base64Binary -->
<xs:enumeration value="1" />
<!-- base64String -->
<xs:enumeration value="1" />
<!-- base64Binary -->
<xs:enumeration value="2" />
</xs:restriction>
</xs:simpleType>
......
......@@ -77,8 +77,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="sizeAbove" type="xs:nonNegativeInteger" 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="operationMonitor" type="m2m:operationMonitor" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="operationMonitor" type="m2m:operation" minOccurs="0" maxOccurs="unbounded" />
<xs:element name="attribute" type="m2m:attributeTest" minOccurs="0" maxOccurs="unbounded" />
</xs:sequence>
</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