From dd56dd095ae9b547c127d71f7cdc437a77160cd8 Mon Sep 17 00:00:00 2001
From: PeterNiblett <pdn3270@gmail.com>
Date: Sun, 18 Jan 2015 23:02:53 +0000
Subject: [PATCH] content/primitiveContent siwtchover
---
CDT-commonTypes-v0_8_0.xsd | 6 +++---
CDT-request-v0_8_0.xsd | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CDT-commonTypes-v0_8_0.xsd b/CDT-commonTypes-v0_8_0.xsd
index a0ab4d3..25d0b5e 100644
--- a/CDT-commonTypes-v0_8_0.xsd
+++ b/CDT-commonTypes-v0_8_0.xsd
@@ -329,7 +329,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
- <xs:complexType name="content" >
+ <xs:complexType name="primitiveContent" >
<xs:sequence>
<xs:any namespace="http://www.onem2m.org/xml/protocols"
processContents="lax" minOccurs="0" maxOccurs="unbounded" />
@@ -414,7 +414,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="to" type="xs:anyURI" />
<xs:element name="from" type="m2m:ID" />
<xs:element name="requestIdentifier" type="m2m:requestID" />
- <xs:element name="content" type="m2m:content" minOccurs="0" />
+ <xs:element name="content" type="m2m:primitiveContent" minOccurs="0" />
<xs:element name="metaInformation" type="m2m:metaInformation" minOccurs="0" />
</xs:sequence>
</xs:complexType>
@@ -425,7 +425,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- TODO: is this a sensible order? -->
<xs:complexType name="operationResult">
<xs:sequence>
- <xs:element name="content" type="m2m:content" minOccurs="0" />
+ <xs:element name="content" type="m2m:primitiveContent" minOccurs="0" />
<xs:element name="eventCategory" type="m2m:eventCatType" minOccurs="0" />
<xs:element name="from" type="m2m:ID" minOccurs="0"/>
<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
diff --git a/CDT-request-v0_8_0.xsd b/CDT-request-v0_8_0.xsd
index 41d65e7..f778307 100644
--- a/CDT-request-v0_8_0.xsd
+++ b/CDT-request-v0_8_0.xsd
@@ -40,10 +40,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="stateTag" type="xs:nonNegativeInteger" />
<xs:element name="operation" type="m2m:operation" />
<xs:element name="target" type="xs:anyURI" />
- <xs:element name="originator" type="xs:anyURI" />
- <xs:element name="requestIdentifier" type="m2m:requestID" />
+ <xs:element name="originator" type="m2m:ID" />
+ <xs:element name="requestID" type="m2m:requestID" />
<xs:element name="metaInformation" type="m2m:metaInformation" />
- <xs:element name="primitiveContent" type="m2m:content" />
+ <xs:element name="content" type="m2m:primitiveContent" />
<xs:element name="requestStatus" type="m2m:requestStatus" />
<xs:element name="operationResult" type="m2m:operationResult" />
--
GitLab