diff --git a/v2_15_0/CDT-AE-v2_15_0.xsd b/v2_15_0/CDT-AE-v2_15_0.xsd index a70a2976e8a60d6562c8adf3fd1b88580b73721c..808a68db1499fd310517f2ed783e24f47255c16b 100644 --- a/v2_15_0/CDT-AE-v2_15_0.xsd +++ b/v2_15_0/CDT-AE-v2_15_0.xsd @@ -53,6 +53,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="requestReachability" type="xs:boolean" /> <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" /> <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" /> <!-- Child Resources --> <xs:choice minOccurs="0" maxOccurs="1"> @@ -92,6 +93,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="requestReachability" type="xs:boolean" minOccurs="0" /> <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" /> <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" /> <!-- Child Resources --> <xs:choice minOccurs="0" maxOccurs="1"> diff --git a/v2_15_0/CDT-CSEBase-v2_15_0.xsd b/v2_15_0/CDT-CSEBase-v2_15_0.xsd index ae8f2f4989a0c92bf2be106146b193e3d343213e..281689f15c96279d825769f71fc0d8a7bc06feb5 100644 --- a/v2_15_0/CDT-CSEBase-v2_15_0.xsd +++ b/v2_15_0/CDT-CSEBase-v2_15_0.xsd @@ -66,6 +66,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> <xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" /> <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" /> <!-- Child Resources --> <xs:choice minOccurs="0" maxOccurs="1"> diff --git a/v2_15_0/CDT-commonTypes-v2_15_0.xsd b/v2_15_0/CDT-commonTypes-v2_15_0.xsd index 527ac4e010cabf379ec12707879ed66b9dcb85fc..5966aeb9ded867459bda518fbcaeb77694b9cd23 100644 --- a/v2_15_0/CDT-commonTypes-v2_15_0.xsd +++ b/v2_15_0/CDT-commonTypes-v2_15_0.xsd @@ -408,6 +408,30 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:union> </xs:simpleType> + <xs:simpleType name="releaseVersion"> + <xs:restriction base="xs:string" > + <xs:pattern value="2a"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="applicableReleaseVersion"> + <xs:restriction base="xs:string" > + <xs:pattern value="1"/> + <xs:pattern value="2"/> + <xs:pattern value="2a"/> + </xs:restriction> + </xs:simpleType> + + <xs:simpleType name="supportedReleaseVersions"> + <xs:restriction> + <xs:simpleType> + <xs:list itemType="m2m:applicableReleaseVersion" /> + </xs:simpleType> + <xs:minLength value="1" /> + </xs:restriction> + </xs:simpleType> + + <!--********************** --> <!-- oneM2M Complex Types --> <!--********************** --> @@ -495,11 +519,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:restriction> </xs:simpleType> </xs:element> + <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/> </xs:sequence> </xs:complexType> -<!-- primitiveContent defined in CDT-reqestPrimitive and CDT-responsePrimitive ??? --> + <!-- primitiveContent used in CDT-reqestPrimitive and CDT-responsePrimitive --> <xs:complexType name="primitiveContent"> <xs:choice minOccurs="0" > <xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" /> diff --git a/v2_15_0/CDT-enumerationTypes-v2_15_0.xsd b/v2_15_0/CDT-enumerationTypes-v2_15_0.xsd index 06f2b1345832e989130aa520fa36ddc96576862e..602f73cb55efca0df71a1d10f8dcbb8e1417299f 100644 --- a/v2_15_0/CDT-enumerationTypes-v2_15_0.xsd +++ b/v2_15_0/CDT-enumerationTypes-v2_15_0.xsd @@ -274,7 +274,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <!-- UPDATED --> <xs:enumeration value="2004" /> <!-- BAD_REQUEST --> - <xs:enumeration value="4000" /> + <xs:enumeration value="4000" /> + <!-- RELEASE_VERSION_NOT_SUPPORTE --> + <xs:enumeration value="4001" /> <!-- NOT_FOUND --> <xs:enumeration value="4004" /> <!-- OPERATION_NOT_ALLOWED --> diff --git a/v2_15_0/CDT-notification-v2_15_0.xsd b/v2_15_0/CDT-notification-v2_15_0.xsd index a84d16b6542a1609248c11f2d728fb13bea210f8..97ac3fe9ce378a7fb31baa3b100544bcef8e11d1 100644 --- a/v2_15_0/CDT-notification-v2_15_0.xsd +++ b/v2_15_0/CDT-notification-v2_15_0.xsd @@ -43,7 +43,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="notificationEvent" minOccurs="0"> <xs:complexType > <xs:sequence> - <xs:element name="representation" type="xs:anyType" minOccurs="0"/> + <xs:element name="representation" type="m2m:representation" minOccurs="0"/> <xs:element name="operationMonitor" minOccurs="0"> <xs:complexType> <xs:sequence> @@ -56,12 +56,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:sequence> </xs:complexType> </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="creator" type="m2m:ID" minOccurs="0"/> - <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/> - <xs:element name="IPEDiscoveryRequest" minOccurs="0"> + <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="creator" type="m2m:ID" minOccurs="0"/> + <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/> + <xs:element name="notificationTarget" type="m2m:ID" minOccurs="0"/> + <xs:element name="targetRemovalRequest" type="xs:boolean" minOccurs="0"/> + <xs:element name="targetRemovalAllowance" type="xs:boolean" minOccurs="0"/> + <xs:element name="IPEDiscoveryRequest" minOccurs="0"> <xs:complexType > <xs:sequence> <xs:element name="originator" type="m2m:ID" /> @@ -124,5 +127,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:element> </xs:sequence> </xs:complexType> + + <xs:complexType name="representation"> + <xs:choice minOccurs="0" > + <xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" /> + <xs:any namespace="##other" processContents="lax" /> + </xs:choice> + </xs:complexType> </xs:schema> diff --git a/v2_15_0/CDT-remoteCSE-v2_15_0.xsd b/v2_15_0/CDT-remoteCSE-v2_15_0.xsd index 2a970d5738bce0c321594c91bf13b535dfbc0be9..b1d213d379ff7acbbe3dc1ad250134b0d66e68a5 100644 --- a/v2_15_0/CDT-remoteCSE-v2_15_0.xsd +++ b/v2_15_0/CDT-remoteCSE-v2_15_0.xsd @@ -55,6 +55,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> <xs:element name="triggerReferenceNumber" type="xs:unsignedInt" minOccurs="0" /> <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" /> <!-- Child Resources --> <xs:choice minOccurs="0" maxOccurs="1"> @@ -98,6 +99,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="requestReachability" type="xs:boolean" minOccurs="0" /> <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" /> <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" /> + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" /> <!-- Child Resources --> <xs:choice minOccurs="0" maxOccurs="1"> diff --git a/v2_15_0/CDT-requestPrimitive-v2_15_0.xsd b/v2_15_0/CDT-requestPrimitive-v2_15_0.xsd index dce50ff8218d0a3b2b289788fae7c038239fcfc7..7bc93dd88c0b6ed4d864852718930bf0ce6efb36 100644 --- a/v2_15_0/CDT-requestPrimitive-v2_15_0.xsd +++ b/v2_15_0/CDT-requestPrimitive-v2_15_0.xsd @@ -116,6 +116,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:element> <!-- parameter "Token Request Indicator" --> <xs:element name="tokenRequestIndicator" type="xs:boolean" minOccurs="0"/> + <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/> </xs:sequence> </xs:complexType> </xs:element> diff --git a/v2_15_0/CDT-responsePrimitive-v2_15_0.xsd b/v2_15_0/CDT-responsePrimitive-v2_15_0.xsd index a159eb515259d9b444079c68bba60ff99014b939..833910d13b5e8de9e5b014e96bc446df2d441e71 100644 --- a/v2_15_0/CDT-responsePrimitive-v2_15_0.xsd +++ b/v2_15_0/CDT-responsePrimitive-v2_15_0.xsd @@ -106,7 +106,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <!-- parameter "Assigned Token Identifiers --> <xs:element name="assignedTokenIdentifiers" type="m2m:dynAuthLocalTokenIdAssignments" minOccurs="0" /> <!-- parameter "Token Request Information --> - <xs:element name="tokenRequestInformation" type="m2m:dynAuthTokenReqInfo" minOccurs="0" /> + <xs:element name="tokenRequestInformation" type="m2m:dynAuthTokenReqInfo" minOccurs="0" /> + <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/> </xs:sequence> </xs:complexType> </xs:element> diff --git a/v2_15_0/CDT-subscription-v2_15_0.xsd b/v2_15_0/CDT-subscription-v2_15_0.xsd index e2093b043cfeef081fb2b0aba5b1ec854a62f723..1f04f7521bcd55d3a18df66031873a4d683c5ee9 100644 --- a/v2_15_0/CDT-subscription-v2_15_0.xsd +++ b/v2_15_0/CDT-subscription-v2_15_0.xsd @@ -90,8 +90,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:complexType name="batchNotify"> <xs:sequence> - <xs:element name="number" type="xs:nonNegativeInteger" /> - <xs:element name="duration" type="xs:duration" /> + <xs:element name="number" type="xs:nonNegativeInteger" minOccurs="0" /> + <xs:element name="duration" type="xs:duration" minOccurs="0" /> </xs:sequence> </xs:complexType>