From 00c2e3ed02addf610a68f995166836aeacf90946 Mon Sep 17 00:00:00 2001
From: Wolfgang Granzow <wgranzow@qti.qualcomm.com>
Date: Tue, 8 Nov 2016 15:36:45 +0100
Subject: [PATCH] Release-2 changes agreed at PRO#25
See details in
PRO-2016-0444-PRO25_changes_of_XML_schemas_to_align_with_TS-0004
---
v2_8_0/CDT-commonTypes-v2_8_0.xsd | 78 +++++++++++++++++--
v2_8_0/CDT-enumerationTypes-v2_8_0.xsd | 8 +-
.../CDT-genericInterworkingService-v2_8_0.xsd | 6 +-
v2_8_0/CDT-group-v2_8_0.xsd | 2 +-
v2_8_0/CDT-requestPrimitive-v2_8_0.xsd | 24 +++++-
.../CDT-serviceSubscribedAppRule-v2_8_0.xsd | 10 +++
v2_8_0/CDT-subscription-v2_8_0.xsd | 2 +-
7 files changed, 115 insertions(+), 15 deletions(-)
diff --git a/v2_8_0/CDT-commonTypes-v2_8_0.xsd b/v2_8_0/CDT-commonTypes-v2_8_0.xsd
index cbe0e24..fc9462b 100644
--- a/v2_8_0/CDT-commonTypes-v2_8_0.xsd
+++ b/v2_8_0/CDT-commonTypes-v2_8_0.xsd
@@ -386,6 +386,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:union>
</xs:simpleType>
+ <xs:simpleType name="resourceName">
+ <xs:restriction base="xs:string" >
+ <xs:pattern value="[a-zA-Z0-9]([a-zA-Z0-9\.\-,_]*)" />
+ </xs:restriction>
+ </xs:simpleType>
+
<!--********************** -->
<!-- oneM2M Complex Types -->
<!--********************** -->
@@ -433,6 +439,47 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<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="roleIDs" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:roleID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="tokenRequestIndicator" type="xs:boolean" minOccurs="0" />
+ <xs:element name="tokens" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:dynAuthJWT" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="tokenIDs" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:tokenID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ <xs:element name="localTokenIDs" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="xs:NCName" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
</xs:sequence>
</xs:complexType>
@@ -589,7 +636,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="mgmtLinkRef">
<xs:simpleContent>
<xs:extension base="xs:anyURI">
- <xs:attribute name="name" type="xs:NCName" use="required" />
+ <xs:attribute name="name" type="m2m:resourceName" use="required" />
<xs:attribute name="type" type="m2m:mgmtDefinition" use="required" />
</xs:extension>
</xs:simpleContent>
@@ -647,13 +694,32 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:complexType>
</xs:element>
<xs:element name="accessControlAuthenticationFlag" type="xs:boolean" minOccurs="0" />
+ <xs:element name="accessControlObjectDetails" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
+ <xs:element name="specializationID" type="xs:anyURI" minOccurs="0" />
+ <xs:element name="childResourceType" minOccurs="1" maxOccurs="1">
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:resourceType" />
+ </xs:simpleType>
+ <xs:minLength value="1"/>
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
</xs:sequence>
</xs:complexType>
<xs:complexType name="childResourceRef">
<xs:simpleContent>
<xs:extension base="xs:anyURI">
- <xs:attribute name="name" type="xs:NCName" use="required" />
+ <xs:attribute name="name" type="m2m:resourceName" use="required" />
<xs:attribute name="type" type="m2m:resourceType" use="required" />
<xs:attribute name="specializationID" type="xs:anyURI" use="optional" />
</xs:extension>
@@ -663,7 +729,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:complexType name="responseTypeInfo">
<xs:sequence>
<xs:element name="responseTypeValue" type="m2m:responseType" />
- <xs:element name="notificationURI">
+ <xs:element name="notificationURI" minOccurs="0">
<xs:simpleType>
<xs:restriction>
<xs:simpleType>
@@ -1023,7 +1089,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="lastModifiedTime" type="m2m:timestamp" />
<xs:element name="labels" type="m2m:labels" minOccurs="0" />
</xs:sequence>
- <xs:attribute name="resourceName" type="xs:NCName" use="required" />
+ <xs:attribute name="resourceName" type="m2m:resourceName" use="required" />
</xs:complexType>
<xs:complexType name="regularResource">
@@ -1168,7 +1234,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="containerDefinition" type="xs:anyURI" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
</xs:sequence>
- <xs:attribute name="resourceName" type="xs:NCName" use="required" />
+ <xs:attribute name="resourceName" type="m2m:resourceName" use="required" />
</xs:complexType>
<xs:complexType name="announcedFlexContainerResource">
@@ -1187,7 +1253,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="containerDefinition" type="xs:anyURI" />
<xs:element name="ontologyRef" type="xs:anyURI" minOccurs="0" />
</xs:sequence>
- <xs:attribute name="resourceName" type="xs:NCName" use="required" />
+ <xs:attribute name="resourceName" type="m2m:resourceName" use="required" />
</xs:complexType>
<!-- The following Global Elements define substitution groups -->
diff --git a/v2_8_0/CDT-enumerationTypes-v2_8_0.xsd b/v2_8_0/CDT-enumerationTypes-v2_8_0.xsd
index 29a29b5..a770c38 100644
--- a/v2_8_0/CDT-enumerationTypes-v2_8_0.xsd
+++ b/v2_8_0/CDT-enumerationTypes-v2_8_0.xsd
@@ -333,7 +333,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="5210" />
<!-- ESPRIM_ENCRYPTION_ERROR -->
<xs:enumeration value="5211" />
- <!-- EXTERNAL_OBJECT_NOT_REACHABLE -->
+ <!-- ESPRIM_ENCRYPTION_ERROR -->
+ <xs:enumeration value="5212" />
+ <!-- SPARQL_UPDATE_ERROR -->
<xs:enumeration value="6003" />
<!-- EXTERNAL_OBJECT_NOT_FOUND -->
<xs:enumeration value="6005" />
@@ -569,6 +571,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:documentation></xs:documentation>
</xs:annotation>
<xs:restriction base="xs:integer">
+ <!-- STATUS_SUCCESS -->
+ <xs:enumeration value="0" />
<!-- STATUS_REQUEST_UNSUPPORTED -->
<xs:enumeration value="1" />
<!-- STATUS_REQUEST DENIED -->
@@ -625,6 +629,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="29" />
<!-- STATUS_INVALID_DEPLOYMENT_UNIT_UPDATE_VERSION_EXISTS -->
<xs:enumeration value="30" />
+ <!-- STATUS_NOT_FINISHED -->
+ <xs:enumeration value="31" />
</xs:restriction>
</xs:simpleType>
diff --git a/v2_8_0/CDT-genericInterworkingService-v2_8_0.xsd b/v2_8_0/CDT-genericInterworkingService-v2_8_0.xsd
index 6fbaa2f..d18d818 100644
--- a/v2_8_0/CDT-genericInterworkingService-v2_8_0.xsd
+++ b/v2_8_0/CDT-genericInterworkingService-v2_8_0.xsd
@@ -39,8 +39,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:sequence>
<!-- Resource Specific Attributes -->
<xs:element name="serviceName" type="xs:string" />
- <xs:element name="inputDataPointLinks" type="m2m:ID" minOccurs="0" />
- <xs:element name="outputDataPointLinks" type="m2m:poaList" minOccurs="0" />
+ <xs:element name="inputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
+ <xs:element name="outputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
@@ -65,7 +65,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:extension base="m2m:announcedFlexContainerResource">
<xs:sequence>
<!-- Resource Specific Attributes -->
- <xs:element name="serviceName" type="xs:string" minOccurs="0" />
+ <xs:element name="serviceName" type="xs:string" />
<xs:element name="inputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
<xs:element name="outputDataPointLinks" type="m2m:listOfDataLinks" minOccurs="0" />
diff --git a/v2_8_0/CDT-group-v2_8_0.xsd b/v2_8_0/CDT-group-v2_8_0.xsd
index 5460bba..6f3eb39 100644
--- a/v2_8_0/CDT-group-v2_8_0.xsd
+++ b/v2_8_0/CDT-group-v2_8_0.xsd
@@ -45,7 +45,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="maxNrOfMembers" type="xs:positiveInteger" />
<xs:element name="memberIDs" type="m2m:listOfURIs" />
<xs:element name="membersAccessControlPolicyIDs" type="m2m:listOfURIs" minOccurs="0" />
- <xs:element name="memberTypeValidated" type="xs:boolean" />
+ <xs:element name="memberTypeValidated" type="xs:boolean" minOccurs="0"/>
<xs:element name="consistencyStrategy" type="m2m:consistencyStrategy" minOccurs="0" />
<xs:element name="groupName" type="xs:string" minOccurs="0" />
diff --git a/v2_8_0/CDT-requestPrimitive-v2_8_0.xsd b/v2_8_0/CDT-requestPrimitive-v2_8_0.xsd
index f779a1c..7bb14d2 100644
--- a/v2_8_0/CDT-requestPrimitive-v2_8_0.xsd
+++ b/v2_8_0/CDT-requestPrimitive-v2_8_0.xsd
@@ -82,9 +82,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- parameter "Discovery Result Type" -->
<xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
<!-- parameter "Tokens" -->
- <xs:element name="tokens" type="m2m:dynAuthJWT" minOccurs="0"/>
+ <xs:element name="tokens" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:dynAuthJWT" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
<!-- parameter "Token IDs" -->
- <xs:element name="tokenIDs" type="m2m:tokenID" minOccurs="0"/>
+ <xs:element name="tokenIDs" minOccurs="0">
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:tokenID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
<!-- parameter "Local Token IDs" -->
<xs:element name="localTokenIDs" minOccurs="0">
<xs:simpleType>
@@ -97,7 +115,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleType>
</xs:element>
<!-- parameter "Token Request Indicator" -->
- <xs:element name="tokenReqIndicator" type="xs:boolean" minOccurs="0"/>
+ <xs:element name="tokenRequestIndicator" type="xs:boolean" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
diff --git a/v2_8_0/CDT-serviceSubscribedAppRule-v2_8_0.xsd b/v2_8_0/CDT-serviceSubscribedAppRule-v2_8_0.xsd
index 786c41e..65c40f0 100644
--- a/v2_8_0/CDT-serviceSubscribedAppRule-v2_8_0.xsd
+++ b/v2_8_0/CDT-serviceSubscribedAppRule-v2_8_0.xsd
@@ -39,6 +39,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="applicableCredIDs" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="allowedApp-IDs" type="m2m:listOfM2MID" minOccurs="0" />
<xs:element name="allowedAEs" type="m2m:listOfM2MID" minOccurs="0" />
+ <xs:element name="allowedRole-IDs" minOccurs="0" >
+ <xs:simpleType>
+ <xs:restriction>
+ <xs:simpleType>
+ <xs:list itemType="m2m:roleID" />
+ </xs:simpleType>
+ <xs:minLength value="1" />
+ </xs:restriction>
+ </xs:simpleType>
+ </xs:element>
<!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1">
diff --git a/v2_8_0/CDT-subscription-v2_8_0.xsd b/v2_8_0/CDT-subscription-v2_8_0.xsd
index dbaa20b..8dad3d9 100644
--- a/v2_8_0/CDT-subscription-v2_8_0.xsd
+++ b/v2_8_0/CDT-subscription-v2_8_0.xsd
@@ -82,7 +82,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
<xs:element name="operationMonitor" type="m2m:operation" minOccurs="0" maxOccurs="5" />
- <xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
+ <xs:element name="attribute" type="m2m:attributeList" minOccurs="0" maxOccurs="1" />
<xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="5" />
<xs:element name="missingData" type="m2m:missingData" minOccurs="0" />
</xs:sequence>
--
GitLab