From b0a5c48e95e364192e92601eb1edbecd04f367c7 Mon Sep 17 00:00:00 2001
From: PeterNiblett <pdn3270@gmail.com>
Date: Mon, 19 Jan 2015 02:57:43 +0000
Subject: [PATCH] more changes following PRO14.3
---
CDT-enumerationTypes-v0_8_0.xsd | 2 +-
CDT-execInstance-v0_8_0.xsd | 4 +---
CDT-mgmtCmd-v0_8_0.xsd | 28 ++++++++++++++--------------
CDT-node-v0_8_0.xsd | 4 ++--
CDT-pollingChannel-v0_8_0.xsd | 7 ++-----
CDT-statsConfig-v0_8_0.xsd | 1 -
6 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/CDT-enumerationTypes-v0_8_0.xsd b/CDT-enumerationTypes-v0_8_0.xsd
index d9dd569..b56d15f 100644
--- a/CDT-enumerationTypes-v0_8_0.xsd
+++ b/CDT-enumerationTypes-v0_8_0.xsd
@@ -360,7 +360,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="execStateType">
+ <xs:simpleType name="execStatusType">
<xs:annotation>
<xs:documentation>Used for execStatusType attribute in <execInstance> resource.</xs:documentation>
</xs:annotation>
diff --git a/CDT-execInstance-v0_8_0.xsd b/CDT-execInstance-v0_8_0.xsd
index 3172f94..87df206 100644
--- a/CDT-execInstance-v0_8_0.xsd
+++ b/CDT-execInstance-v0_8_0.xsd
@@ -36,9 +36,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:regularResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
-
- <!-- 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="execStatus" type="m2m:execStatusType" />
<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 -->
diff --git a/CDT-mgmtCmd-v0_8_0.xsd b/CDT-mgmtCmd-v0_8_0.xsd
index 8e1835b..04ec5b8 100644
--- a/CDT-mgmtCmd-v0_8_0.xsd
+++ b/CDT-mgmtCmd-v0_8_0.xsd
@@ -39,22 +39,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="description" type="xs:string" minOccurs="0" />
- <xs:element name="cmdType" type="m2m:cmdType" />
- <xs:element name="execReqType" type="m2m:execReqArgsListType" minOccurs="0" />
+ <xs:element name="cmdType" type="m2m:cmdType" />
+ <xs:element name="execReqArgs" type="m2m:execReqArgsListType" minOccurs="0" />
<xs:element name="execEnable" type="xs:anyURI" />
- <xs:element name="execTarget" type="m2m:nodeID" />
- <xs:element name="execMode" type="m2m:execModeType" minOccurs="0" />
- <xs:element name="execFrequency" type="xs:duration" minOccurs="0" />
- <xs:element name="execDelay" type="xs:duration" minOccurs="0" />
- <xs:element name="execNumber" type="xs:nonNegativeInteger" minOccurs="0" />
-
+ <xs:element name="execTarget" type="m2m:nodeID" />
+ <xs:element name="execMode" type="m2m:execModeType" minOccurs="0" />
+ <xs:element name="execFrequency" type="xs:duration" minOccurs="0" />
+ <xs:element name="execDelay" type="xs:duration" minOccurs="0" />
+ <xs:element name="execNumber" type="xs:nonNegativeInteger" minOccurs="0" />
+
<!-- Child Resources -->
- <xs:choice minOccurs="1" maxOccurs="1">
- <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
- <xs:sequence>
- <xs:element ref="m2m:execInstance"/>
- <xs:element ref="m2m:subscription" minOccurs="0" maxOccurs="unbounded" />
- </xs:sequence>
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="m2m:execInstance" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
</xs:choice>
</xs:sequence>
</xs:extension>
diff --git a/CDT-node-v0_8_0.xsd b/CDT-node-v0_8_0.xsd
index 15caa7c..2e1d84b 100644
--- a/CDT-node-v0_8_0.xsd
+++ b/CDT-node-v0_8_0.xsd
@@ -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" />
<!-- 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 -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -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" />
<!-- 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 -->
<xs:choice minOccurs="0" maxOccurs="1">
diff --git a/CDT-pollingChannel-v0_8_0.xsd b/CDT-pollingChannel-v0_8_0.xsd
index 030da4b..63e1957 100644
--- a/CDT-pollingChannel-v0_8_0.xsd
+++ b/CDT-pollingChannel-v0_8_0.xsd
@@ -36,12 +36,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- Inherit common attributes -->
<xs:extension base="m2m:regularResource">
<xs:sequence>
- <!-- 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" />
-
+ <!-- No Resource Specific Attributes -->
+
<!-- Child Resources -->
- <!-- TODO: decide if this is how we want to represent virtual resources or not -->
<xs:element name="pollingChannelURI" type="xs:anyURI" />
</xs:sequence>
</xs:extension>
diff --git a/CDT-statsConfig-v0_8_0.xsd b/CDT-statsConfig-v0_8_0.xsd
index 16eb9e5..e455ba7 100644
--- a/CDT-statsConfig-v0_8_0.xsd
+++ b/CDT-statsConfig-v0_8_0.xsd
@@ -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">
<xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" />
-
<xs:include schemaLocation="CDT-eventConfig-v0_8_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" />
--
GitLab