Commit dd56dd09 authored by Peter Niblett's avatar Peter Niblett

content/primitiveContent siwtchover

parent 97e8e90c
......@@ -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"/>
......
......@@ -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" />
......
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