From 3902c98f1d064054d8909b322ba619e843fb9bbc Mon Sep 17 00:00:00 2001
From: PeterNiblett <pdn3270@gmail.com>
Date: Mon, 12 Jan 2015 10:23:37 +0000
Subject: [PATCH] Allow <contentInstanceAnnc> as a child resource of
<containerAnnc>
---
CDT-container-v0_8_0.xsd | 4 ++--
README.md | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/CDT-container-v0_8_0.xsd b/CDT-container-v0_8_0.xsd
index 65bffe4..6416ec9 100644
--- a/CDT-container-v0_8_0.xsd
+++ b/CDT-container-v0_8_0.xsd
@@ -80,10 +80,10 @@
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:contentInstance" />
+ <xs:element ref="m2m:contentInstanceAnnc" />
<xs:element ref="m2m:container" />
- <xs:element ref="m2m:subscription" />
<xs:element ref="m2m:containerAnnc" />
- <!-- should m2m:contentInstanceAnnc be allowed as well? -->
+ <xs:element ref="m2m:subscription" />
</xs:choice>
</xs:choice>
</xs:sequence>
diff --git a/README.md b/README.md
index 5185ba9..de97389 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,7 @@ General
\<container\>
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\>
m2m:resourceTypeList can be removed, since this type can be declared inline
@@ -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
Consider moving the m2m:filterUsage enumeration type into CDT-enumerationTypes
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)
--
GitLab