From cd5b072fed192316dc2e56b64480babd7f5822d0 Mon Sep 17 00:00:00 2001
From: Peter Niblett <peter_niblett@uk.ibm.com>
Date: Thu, 27 Jun 2024 13:19:54 +0100
Subject: [PATCH] Fix issue #122
---
v3_31_0/CDT-CSEBase-v3_31_0.xsd | 35 +++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/v3_31_0/CDT-CSEBase-v3_31_0.xsd b/v3_31_0/CDT-CSEBase-v3_31_0.xsd
index 23d4077..bc3b339 100644
--- a/v3_31_0/CDT-CSEBase-v3_31_0.xsd
+++ b/v3_31_0/CDT-CSEBase-v3_31_0.xsd
@@ -85,6 +85,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="m2m:CSEBaseAnnc" />
<xs:element ref="m2m:remoteCSE" />
<xs:element ref="m2m:remoteCSEAnnc" />
<xs:element ref="m2m:node" />
@@ -124,4 +125,38 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexContent>
</xs:complexType>
</xs:element>
+ <xs:element name="CSEBaseAnnc" substitutionGroup="m2m:sg_announcedResource">
+ <xs:complexType>
+ <xs:complexContent>
+ <!-- Inherit just the universal resource attributes -->
+ <xs:extension base="m2m:announcedResource">
+ <xs:sequence>
+ <!-- Resource Specific Attributes -->
+ <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
+ <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" minOccurs="1"/>
+
+ <!-- Child Resources -->
+ <xs:choice minOccurs="0" maxOccurs="1">
+ <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+ <xs:choice minOccurs="1" maxOccurs="unbounded">
+ <xs:element ref="m2m:remoteCSEAnnc" />
+ <xs:element ref="m2m:nodeAnnc" />
+ <xs:element ref="m2m:containerAnnc" />
+ <xs:element ref="m2m:groupAnnc" />
+ <xs:element ref="m2m:accessControlPolicyAnnc" />
+ <xs:element ref="m2m:timeSeriesAnnc" />
+ <xs:element ref="m2m:locationPolicyAnnc" />
+ <xs:element ref="m2m:AEAnnc" />
+ <xs:element ref="m2m:sg_announcedFlexContainerResource" />
+ <xs:element ref="m2m:ontologyRepositoryAnnc" />
+ <xs:element ref="m2m:semanticMashupJobProfileAnnc" />
+ <xs:element ref="m2m:semanticMashupInstanceAnnc" />
+ </xs:choice>
+ </xs:choice>
+ </xs:sequence>
+ </xs:extension>
+ </xs:complexContent>
+ </xs:complexType>
+ </xs:element>
+
</xs:schema>
--
GitLab