From eaf94fe4a6de9d1ba7f7c5735c8670ae9edd02dc Mon Sep 17 00:00:00 2001
From: PeterNiblett <pdn3270@gmail.com>
Date: Mon, 8 Jun 2015 17:11:45 +0100
Subject: [PATCH] Further TP#17 corrections
---
v1_2_0/CDT-AE-v1_2_0.xsd | 2 +-
v1_2_0/CDT-commonTypes-v1_2_0.xsd | 2 +-
v1_2_0/CDT-enumerationTypes-v1_2_0.xsd | 4 ++--
v1_2_0/CDT-requestPrimitive-v1_2_0.xsd | 2 +-
v1_2_0/CDT-responsePrimitive-v1_2_0.xsd | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/v1_2_0/CDT-AE-v1_2_0.xsd b/v1_2_0/CDT-AE-v1_2_0.xsd
index 29ca524..c714dc6 100644
--- a/v1_2_0/CDT-AE-v1_2_0.xsd
+++ b/v1_2_0/CDT-AE-v1_2_0.xsd
@@ -93,7 +93,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element ref="m2m:accessControlPolicy" />
<xs:element ref="m2m:accessControlPolicyAnnc" />
<xs:element ref="m2m:subscription" />
- <xs:element ref="m2m:pollingChannel" />
+ <xs:element ref="m2m:scheduleAnnc" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/v1_2_0/CDT-commonTypes-v1_2_0.xsd b/v1_2_0/CDT-commonTypes-v1_2_0.xsd
index db246e6..1f1171f 100644
--- a/v1_2_0/CDT-commonTypes-v1_2_0.xsd
+++ b/v1_2_0/CDT-commonTypes-v1_2_0.xsd
@@ -62,7 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType>
<xs:simpleType name="acpType">
- <list itemType="xs:anyURI" />
+ <list itemType="m2m:ID" />
</xs:simpleType>
<xs:simpleType name="labels">
diff --git a/v1_2_0/CDT-enumerationTypes-v1_2_0.xsd b/v1_2_0/CDT-enumerationTypes-v1_2_0.xsd
index 467fe02..c94309b 100644
--- a/v1_2_0/CDT-enumerationTypes-v1_2_0.xsd
+++ b/v1_2_0/CDT-enumerationTypes-v1_2_0.xsd
@@ -275,7 +275,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="6011" />
<!-- MGMT_SESSION_CANNOT_BE_ESTABLISHED -->
<xs:enumeration value="6020" />
- <!-- MGMT_SESSION_ESTABLISHMENT _TIMEOUT -->
+ <!-- MGMT_SESSION_ESTABLISHMENT_TIMEOUT -->
<xs:enumeration value="6021" />
<!-- INVALID_CMDTYPE -->
<xs:enumeration value="6022" />
@@ -285,7 +285,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="6024" />
<!-- MGMT_ CONVERSION_ERROR -->
<xs:enumeration value="6025" />
- <!-- MGMT_ CANCELATION_FAILED -->
+ <!-- MGMT_ CANCELLATION_FAILED -->
<xs:enumeration value="6026" />
<!-- ALREADY_COMPLETE -->
<xs:enumeration value="6028" />
diff --git a/v1_2_0/CDT-requestPrimitive-v1_2_0.xsd b/v1_2_0/CDT-requestPrimitive-v1_2_0.xsd
index ab9d00a..a5a299a 100644
--- a/v1_2_0/CDT-requestPrimitive-v1_2_0.xsd
+++ b/v1_2_0/CDT-requestPrimitive-v1_2_0.xsd
@@ -45,7 +45,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
<!-- parameter "Name" -->
<xs:element name="name" type="xs:NCName" minOccurs="0"/>
- <!-- parameter "primitiveContent" -->
+ <!-- parameter "Content" -->
<xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/>
<!-- parameter "Originating Timestamp" -->
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
diff --git a/v1_2_0/CDT-responsePrimitive-v1_2_0.xsd b/v1_2_0/CDT-responsePrimitive-v1_2_0.xsd
index e0c5062..b68079b 100644
--- a/v1_2_0/CDT-responsePrimitive-v1_2_0.xsd
+++ b/v1_2_0/CDT-responsePrimitive-v1_2_0.xsd
@@ -39,7 +39,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="responseStatusCode" type="m2m:responseStatusCode" minOccurs="1"/>
<!-- parameter "Request Identifier" -->
<xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/>
- <!-- parameter "primitiveContent" -->
+ <!-- parameter "Content" -->
<xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/>
<!-- parameter "To" -->
<xs:element name="to" type="m2m:ID" minOccurs="0"/>
--
GitLab