Commit c83f8f5f authored by Wolfgang Granzow's avatar Wolfgang Granzow

Rel-2 changes agreed at PRO#32

See PRO-2017-0383 for a detailed description of the changes
parent 19dd2c52
......@@ -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">
......
......@@ -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">
......
......@@ -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" />
......
......@@ -275,6 +275,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="2004" />
<!-- BAD_REQUEST -->
<xs:enumeration value="4000" />
<!-- RELEASE_VERSION_NOT_SUPPORTE -->
<xs:enumeration value="4001" />
<!-- NOT_FOUND -->
<xs:enumeration value="4004" />
<!-- OPERATION_NOT_ALLOWED -->
......
......@@ -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>
......@@ -61,6 +61,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<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>
......@@ -125,4 +128,11 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</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>
......@@ -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">
......
......@@ -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>
......
......@@ -107,6 +107,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<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="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
</xs:sequence>
</xs:complexType>
</xs:element>
......
......@@ -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>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment