Skip to content
Snippets Groups Projects
Commit b0a5c48e authored by Peter Niblett's avatar Peter Niblett
Browse files

more changes following PRO14.3

parent 67fa97bd
No related branches found
No related tags found
No related merge requests found
...@@ -360,7 +360,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -360,7 +360,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="execStateType"> <xs:simpleType name="execStatusType">
<xs:annotation> <xs:annotation>
<xs:documentation>Used for execStatusType attribute in &lt;execInstance&gt; resource.</xs:documentation> <xs:documentation>Used for execStatusType attribute in &lt;execInstance&gt; resource.</xs:documentation>
</xs:annotation> </xs:annotation>
......
...@@ -36,9 +36,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -36,9 +36,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:regularResource"> <xs:extension base="m2m:regularResource">
<xs:sequence> <xs:sequence>
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="execStatus" type="m2m:execStatusType" />
<!-- TODO: in TS-0004 7.2.16 this is called m2m:execStatusType, but in the enums it is called execStateType -->
<xs:element name="execStatus" type="m2m:execStateType" />
<xs:element name="execResult" type="m2m:execResultType" /> <xs:element name="execResult" type="m2m:execResultType" />
<!-- TODO: in TS-0004 7.2.16 this is shown as xs:string, but the text suggests that it is a URI --> <!-- TODO: in TS-0004 7.2.16 this is shown as xs:string, but the text suggests that it is a URI -->
......
...@@ -40,7 +40,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -40,7 +40,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="description" type="xs:string" minOccurs="0" /> <xs:element name="description" type="xs:string" minOccurs="0" />
<xs:element name="cmdType" type="m2m:cmdType" /> <xs:element name="cmdType" type="m2m:cmdType" />
<xs:element name="execReqType" type="m2m:execReqArgsListType" minOccurs="0" /> <xs:element name="execReqArgs" type="m2m:execReqArgsListType" minOccurs="0" />
<xs:element name="execEnable" type="xs:anyURI" /> <xs:element name="execEnable" type="xs:anyURI" />
<xs:element name="execTarget" type="m2m:nodeID" /> <xs:element name="execTarget" type="m2m:nodeID" />
<xs:element name="execMode" type="m2m:execModeType" minOccurs="0" /> <xs:element name="execMode" type="m2m:execModeType" minOccurs="0" />
...@@ -49,12 +49,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -49,12 +49,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="execNumber" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="execNumber" type="xs:nonNegativeInteger" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="1" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:sequence> <xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:execInstance" /> <xs:element ref="m2m:execInstance" />
<xs:element ref="m2m:subscription" minOccurs="0" maxOccurs="unbounded" /> <xs:element ref="m2m:subscription" />
</xs:sequence> </xs:choice>
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
......
...@@ -52,7 +52,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -52,7 +52,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="nodeID" type="m2m:nodeID" /> <xs:element name="nodeID" type="m2m:nodeID" />
<!-- TODO: This attribute is called hostedCSEID in TS-0004, but is called hostedCSELink in TS-0001 --> <!-- TODO: This attribute is called hostedCSEID in TS-0004, but is called hostedCSELink in TS-0001 -->
<xs:element name="hostedCSEID" type="m2m:ID" minOccurs="0" /> <xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
...@@ -89,7 +89,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -89,7 +89,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="nodeID" type="m2m:nodeID" /> <xs:element name="nodeID" type="m2m:nodeID" />
<!-- TODO: This attribute is called hostedCSEID in TS-0004, but is called hostedCSELink in TS-0001 --> <!-- TODO: This attribute is called hostedCSEID in TS-0004, but is called hostedCSELink in TS-0001 -->
<xs:element name="hostedCSEID" type="m2m:ID" minOccurs="0" /> <xs:element name="hostedCSELink" type="m2m:ID" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
......
...@@ -36,12 +36,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -36,12 +36,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>
<!-- Resource Specific Attributes --> <!-- No Resource Specific Attributes -->
<!-- TODO: Not clear if there is supposed to be a creator attribute or not -->
<xs:element name="creator" type="m2m:ID" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<!-- TODO: decide if this is how we want to represent virtual resources or not -->
<xs:element name="pollingChannelURI" type="xs:anyURI" /> <xs:element name="pollingChannelURI" type="xs:anyURI" />
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
......
...@@ -27,7 +27,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -27,7 +27,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
<xs:include schemaLocation="CDT-eventConfig-v0_8_0.xsd" /> <xs:include schemaLocation="CDT-eventConfig-v0_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" /> <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment