From 07dc83d007a2a7df0a2aece302f885c6dacacdfd Mon Sep 17 00:00:00 2001
From: reinaortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 11 May 2020 15:09:23 +0200
Subject: [PATCH] XSD v3_10_0 baseline
---
CDT-commonTypes.xsd | 2 +-
CDT-delivery.xsd | 2 +-
CDT-enumerationTypes.xsd | 6 ++++--
CDT-multimediaSession.xsd | 4 ----
CDT-request.xsd | 2 +-
CDT-requestPrimitive.xsd | 4 ++--
CDT-schedule.xsd | 8 ++++----
CDT-timeSeries.xsd | 3 +--
CDT-triggerRequest.xsd | 2 +-
9 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index f3d2447..fde1731 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -558,7 +558,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" />
<xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" />
<xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" />
- <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0" />
+ <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0" />
<xs:element name="roleIDs" minOccurs="0">
<xs:simpleType>
<xs:restriction>
diff --git a/CDT-delivery.xsd b/CDT-delivery.xsd
index f5e8bc9..7e8b5e8 100644
--- a/CDT-delivery.xsd
+++ b/CDT-delivery.xsd
@@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:regularResource">
<xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
- <xs:element name="stateTag" type="xs:nonNegativeInteger" />
+
<!-- Resource Specific Attributes -->
<xs:element name="source" type="m2m:ID" />
<xs:element name="target" type="m2m:ID" />
diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index 1f4a35d..63ebea3 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -288,7 +288,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="discResType">
+ <xs:simpleType name="desIdResType">
<xs:annotation>
<xs:documentation>Used in <request> </xs:documentation>
</xs:annotation>
@@ -378,7 +378,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- INVALID_TRIGGER_PURPOSE -->
<xs:enumeration value="4122" />
<!-- ILLEGAL_TRANSACTION_STATE_TRANSITION_ATTEMPTED -->
- <xs:enumeration value="4123" />
+ <xs:enumeration value="4123" />
+ <!-- SPECIALIZATION_SCHEMA_NOT_FOUND -->
+ <xs:enumeration value="4124" />
<!-- INTERNAL_SERVER_ERROR -->
<xs:enumeration value="5000" />
<!-- NOT_IMPLEMENTED -->
diff --git a/CDT-multimediaSession.xsd b/CDT-multimediaSession.xsd
index d00f03e..4cf91fc 100644
--- a/CDT-multimediaSession.xsd
+++ b/CDT-multimediaSession.xsd
@@ -29,7 +29,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy.xsd" />
<xs:include schemaLocation="CDT-transaction.xsd"/>
<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource">
@@ -49,7 +48,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" />
- <xs:element ref="m2m:accessControlPolicy" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
@@ -74,8 +72,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" />
- <xs:element ref="m2m:accessControlPolicy" />
- <xs:element ref="m2m:accessControlPolicyAnnc" />
<xs:element ref="m2m:transaction" />
</xs:choice>
</xs:choice>
diff --git a/CDT-request.xsd b/CDT-request.xsd
index 7c5e31f..ca7a6f4 100644
--- a/CDT-request.xsd
+++ b/CDT-request.xsd
@@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:regularResource">
<xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
- <xs:element name="stateTag" type="xs:nonNegativeInteger" />
+
<!-- Resource Specific Attributes -->
<xs:element name="operation" type="m2m:operation" />
<xs:element name="target" type="xs:anyURI" />
diff --git a/CDT-requestPrimitive.xsd b/CDT-requestPrimitive.xsd
index 5f4a5ab..5ceeb0f 100644
--- a/CDT-requestPrimitive.xsd
+++ b/CDT-requestPrimitive.xsd
@@ -79,8 +79,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/>
<!-- parameter "Filter Criteria" -->
<xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
- <!-- parameter "Discovery Result Type" -->
- <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
+ <!-- parameter "Desired Identifier Result Type" -->
+ <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0"/>
<!-- parameter "Tokens" -->
<xs:element name="tokens" minOccurs="0">
<xs:simpleType>
diff --git a/CDT-schedule.xsd b/CDT-schedule.xsd
index d045973..b528c0b 100644
--- a/CDT-schedule.xsd
+++ b/CDT-schedule.xsd
@@ -30,10 +30,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:include schemaLocation="CDT-commonTypes.xsd" />
<xs:include schemaLocation="CDT-subscription.xsd" />
- <xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
+ <xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource ">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="m2m:announceableSubordinateResource">
+ <xs:extension base="m2m:announceableResource ">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="scheduleElement" type="m2m:scheduleEntries" />
@@ -53,10 +53,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
- <xs:element name="scheduleAnnc" substitutionGroup="m2m:sg_announcedSubordinateResource">
+ <xs:element name="scheduleAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType>
<xs:complexContent>
- <xs:extension base="m2m:announcedSubordinateResource">
+ <xs:extension base="m2m:announcedResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" />
diff --git a/CDT-timeSeries.xsd b/CDT-timeSeries.xsd
index 5d21411..05fc1f2 100644
--- a/CDT-timeSeries.xsd
+++ b/CDT-timeSeries.xsd
@@ -39,7 +39,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announceableResource">
<xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
- <xs:element name="stateTag" type="xs:nonNegativeInteger" />
<xs:element name="creator" type="m2m:ID" />
<!-- Resource Specific Attributes -->
<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
@@ -77,7 +76,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announcedResource">
<xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
- <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" />
+
<!-- Resource Specific Attributes -->
<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
diff --git a/CDT-triggerRequest.xsd b/CDT-triggerRequest.xsd
index 105912f..71f9695 100644
--- a/CDT-triggerRequest.xsd
+++ b/CDT-triggerRequest.xsd
@@ -47,7 +47,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="triggerInfoAddress" type="xs:anyURI" minOccurs="0" />
<xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0" />
<xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0" />
-
+ <xs:element name="triggerReference" type="xs:string" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
--
GitLab