Commit 3902c98f authored by Peter Niblett's avatar Peter Niblett

Allow <contentInstanceAnnc> as a child resource of <containerAnnc>

parent da1fc57b
...@@ -80,10 +80,10 @@ ...@@ -80,10 +80,10 @@
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded"> <xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:contentInstance" /> <xs:element ref="m2m:contentInstance" />
<xs:element ref="m2m:contentInstanceAnnc" />
<xs:element ref="m2m:container" /> <xs:element ref="m2m:container" />
<xs:element ref="m2m:subscription" />
<xs:element ref="m2m:containerAnnc" /> <xs:element ref="m2m:containerAnnc" />
<!-- should m2m:contentInstanceAnnc be allowed as well? --> <xs:element ref="m2m:subscription" />
</xs:choice> </xs:choice>
</xs:choice> </xs:choice>
</xs:sequence> </xs:sequence>
......
...@@ -24,8 +24,7 @@ General ...@@ -24,8 +24,7 @@ General
\<container\> \<container\>
What values go in latest and oldest if there are no child resources? What values go in latest and oldest if there are no child resources?
Should <containerAnnc> be allowed to have <contentInstanceAnnc> as a child resource?
\<CSEBase\> \<CSEBase\>
m2m:resourceTypeList can be removed, since this type can be declared inline m2m:resourceTypeList can be removed, since this type can be declared inline
...@@ -75,7 +74,7 @@ CDT-commonTypes ...@@ -75,7 +74,7 @@ CDT-commonTypes
It is not easy to see how to represent the changes made by PRO-2014-0562-Implementation_of_Filter_Criteria_as_concept It is not easy to see how to represent the changes made by PRO-2014-0562-Implementation_of_Filter_Criteria_as_concept
Consider moving the m2m:filterUsage enumeration type into CDT-enumerationTypes Consider moving the m2m:filterUsage enumeration type into CDT-enumerationTypes
The order of elements in m2m:operationResult looks a bit strange The order of elements in m2m:operationResult looks a bit strange
It's not clear what the cardinality of m2m:responseStatus/description should be The declaration of m2m:responseStatus/description looks wrong
More general revision and checking of CDT-commonTypes is required (defer this until after the other XSD files are complete) More general revision and checking of CDT-commonTypes is required (defer this until after the other XSD files are complete)
......
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