From 83710b26feac76f6de263ce5c4c9a8bdc97b21d0 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Tue, 6 Feb 2024 15:45:50 +0100
Subject: [PATCH] XSD v3_30_0 baseline
---
CDT-AE.xsd | 2 +-
CDT-enumerationTypes.xsd | 8 ++++----
CDT-mgmtCmd.xsd | 2 +-
CDT-notification.xsd | 2 +-
CDT-timeSeriesNotification.xsd | 17 +++++++++--------
5 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/CDT-AE.xsd b/CDT-AE.xsd
index 9aecd26..9f4e491 100644
--- a/CDT-AE.xsd
+++ b/CDT-AE.xsd
@@ -115,7 +115,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="sessionCapabilities" type="m2m:sessionCapabilities" minOccurs="0" />
<xs:element name="triggerEnable" type="xs:boolean" minOccurs="0" />
<xs:element name="activityPatternElements" type="m2m:activityPatternElements" minOccurs="0" />
-
+
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index 2ad419c..058b931 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -141,9 +141,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="10003" />
<!-- contentInstanceAnnc -->
<xs:enumeration value="10004" />
- <!-- CSEBaseAnnc -->
- <xs:enumeration value="10005" />
<!-- groupAnnc -->
+ <xs:enumeration value="10005" />
+ <!-- CSEBaseAnnc -->
<xs:enumeration value="10009" />
<!-- locationPolicyAnnc -->
<xs:enumeration value="10010" />
@@ -344,7 +344,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="4104" />
<!-- CONFLICT -->
<xs:enumeration value="4105" />
- <!-- ORIGINATOR_HAS_NOT_REGISTERED -->
+ <!-- ORIGINATOR_NOT_AUTHENTICATED -->
<xs:enumeration value="4106" />
<!-- SECURITY_ASSOCIATION_REQUIRED -->
<xs:enumeration value="4107" />
@@ -522,7 +522,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="9" />
<!-- locationPolicy -->
<xs:enumeration value="10" />
- <!-- m2mServiceSubscription -->
+ <!-- m2mServiceSubscriptionProfile -->
<xs:enumeration value="11" />
<!-- mgmtCmd -->
<xs:enumeration value="12" />
diff --git a/CDT-mgmtCmd.xsd b/CDT-mgmtCmd.xsd
index 4f4661c..0fcca8b 100644
--- a/CDT-mgmtCmd.xsd
+++ b/CDT-mgmtCmd.xsd
@@ -49,7 +49,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="execNumber" type="xs:nonNegativeInteger" minOccurs="0" />
<!-- Child Resources -->
- <xs:choice minOccurs="1" maxOccurs="1">
+ <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:execInstance" />
diff --git a/CDT-notification.xsd b/CDT-notification.xsd
index aa6e928..ad463fa 100644
--- a/CDT-notification.xsd
+++ b/CDT-notification.xsd
@@ -58,7 +58,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:element>
<xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/>
<xs:element name="subscriptionDeletion" type="xs:boolean" minOccurs="0"/>
- <xs:element name="subscriptionReference" type="xs:anyURI" minOccurs="0"/>
+ <xs:element name="subscriptionReference" type="xs:anyURI" />
<xs:element name="creator" type="m2m:ID" minOccurs="0"/>
<xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/>
<xs:element name="notificationTarget" type="m2m:ID" minOccurs="0"/>
diff --git a/CDT-timeSeriesNotification.xsd b/CDT-timeSeriesNotification.xsd
index d193b1e..4796810 100644
--- a/CDT-timeSeriesNotification.xsd
+++ b/CDT-timeSeriesNotification.xsd
@@ -29,14 +29,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes.xsd" />
- <xs:element name="timeSeriesNotification">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="missingDataList" type="m2m:missingDataList"/>
- <xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xs:element name="timeSeriesNotification" type="m2m:timeSeriesNotificationType" />
+
+ <xs:complexType name="timeSeriesNotificationType" >
+ <xs:sequence>
+ <xs:element name="missingDataList" type="m2m:missingDataList"/>
+ <xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger"/>
+ </xs:sequence>
+ </xs:complexType>
+
</xs:schema>
--
GitLab