Commit 5dcd0be5 authored by Wolfgang Granzow's avatar Wolfgang Granzow
Browse files

delivery & request XSD: alignment w. #662R02

parent 263f8865
...@@ -38,23 +38,24 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -38,23 +38,24 @@ 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="stateTag" type="xs:nonNegativeInteger" /> <!-- TODO: The type of source and target should match that of CSE-ID (i.e.they should have type m2m:ID) -->
<xs:element name="source" type="m2m:ID" /> <xs:element name="source" type="m2m:ID" />
<xs:element name="target" type="m2m:ID" /> <xs:element name="target" type="m2m:ID" />
<xs:element name="lifespan" type="xs:dateTime" /> <xs:element name="lifespan" type="m2m:timestamp" />
<xs:element name="eventCat" type="m2m:eventCat" /> <xs:element name="eventCat" type="m2m:eventCat" />
<xs:element name="deliveryMetaData" type="m2m:deliveryMetaData" /> <xs:element name="deliveryMetaData" type="m2m:deliveryMetaData" />
<xs:element name="aggregatedRequest" type="m2m:aggregatedRequest" /> <xs:element name="aggregatedRequest" type="m2m:aggregatedRequest" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" /> <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:element ref="m2m:subscription" maxOccurs="unbounded" /> <xs:choice minOccurs="1" maxOccurs="unbounded">
</xs:choice> <xs:element ref="m2m:subscription"></xs:element>
</xs:choice>
</xs:choice>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
</xs:schema> </xs:schema>
\ No newline at end of file
...@@ -37,7 +37,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -37,7 +37,6 @@ 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="stateTag" type="xs:nonNegativeInteger" />
<xs:element name="operation" type="m2m:operation" /> <xs:element name="operation" type="m2m:operation" />
<xs:element name="target" type="xs:anyURI" /> <xs:element name="target" type="xs:anyURI" />
<xs:element name="originator" type="m2m:ID" /> <xs:element name="originator" type="m2m:ID" />
...@@ -48,10 +47,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR ...@@ -48,10 +47,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="operationResult" type="m2m:operationResult" /> <xs:element name="operationResult" type="m2m:operationResult" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" /> <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:element ref="m2m:subscription" maxOccurs="unbounded" /> <xs:choice minOccurs="1" maxOccurs="unbounded">
</xs:choice> <xs:element ref="m2m:subscription"></xs:element>
</xs:choice>
</xs:choice>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
......
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