Commit c83f8f5ff995c48d98ec9109f962b181b9fd6d8b

Authored by Wolfgang Granzow
1 parent 19dd2c52

Rel-2 changes agreed at PRO#32

See PRO-2017-0383 for a detailed description of the changes
... ... @@ -53,6 +53,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
53 53 <xs:element name="requestReachability" type="xs:boolean" />
54 54 <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
55 55 <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
  56 + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
56 57  
57 58 <!-- Child Resources -->
58 59 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -92,6 +93,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
92 93 <xs:element name="requestReachability" type="xs:boolean" minOccurs="0" />
93 94 <xs:element name="contentSerialization" type="m2m:serializations" minOccurs="0" />
94 95 <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
  96 + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
95 97  
96 98 <!-- Child Resources -->
97 99 <xs:choice minOccurs="0" maxOccurs="1">
... ...
... ... @@ -66,6 +66,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
66 66 <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
67 67 <xs:element name="dynamicAuthorizationConsultationIDs" type="m2m:listOfURIs" minOccurs="0" />
68 68 <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
  69 + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
69 70  
70 71 <!-- Child Resources -->
71 72 <xs:choice minOccurs="0" maxOccurs="1">
... ...
... ... @@ -408,6 +408,30 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
408 408 </xs:union>
409 409 </xs:simpleType>
410 410  
  411 + <xs:simpleType name="releaseVersion">
  412 + <xs:restriction base="xs:string" >
  413 + <xs:pattern value="2a"/>
  414 + </xs:restriction>
  415 + </xs:simpleType>
  416 +
  417 + <xs:simpleType name="applicableReleaseVersion">
  418 + <xs:restriction base="xs:string" >
  419 + <xs:pattern value="1"/>
  420 + <xs:pattern value="2"/>
  421 + <xs:pattern value="2a"/>
  422 + </xs:restriction>
  423 + </xs:simpleType>
  424 +
  425 + <xs:simpleType name="supportedReleaseVersions">
  426 + <xs:restriction>
  427 + <xs:simpleType>
  428 + <xs:list itemType="m2m:applicableReleaseVersion" />
  429 + </xs:simpleType>
  430 + <xs:minLength value="1" />
  431 + </xs:restriction>
  432 + </xs:simpleType>
  433 +
  434 +
411 435 <!--********************** -->
412 436 <!-- oneM2M Complex Types -->
413 437 <!--********************** -->
... ... @@ -495,11 +519,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
495 519 </xs:restriction>
496 520 </xs:simpleType>
497 521 </xs:element>
  522 + <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
498 523 </xs:sequence>
499 524 </xs:complexType>
500 525  
501 526  
502   -<!-- primitiveContent defined in CDT-reqestPrimitive and CDT-responsePrimitive ??? -->
  527 + <!-- primitiveContent used in CDT-reqestPrimitive and CDT-responsePrimitive -->
503 528 <xs:complexType name="primitiveContent">
504 529 <xs:choice minOccurs="0" >
505 530 <xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" />
... ...
... ... @@ -274,7 +274,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
274 274 <!-- UPDATED -->
275 275 <xs:enumeration value="2004" />
276 276 <!-- BAD_REQUEST -->
277   - <xs:enumeration value="4000" />
  277 + <xs:enumeration value="4000" />
  278 + <!-- RELEASE_VERSION_NOT_SUPPORTE -->
  279 + <xs:enumeration value="4001" />
278 280 <!-- NOT_FOUND -->
279 281 <xs:enumeration value="4004" />
280 282 <!-- OPERATION_NOT_ALLOWED -->
... ...
... ... @@ -43,7 +43,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
43 43 <xs:element name="notificationEvent" minOccurs="0">
44 44 <xs:complexType >
45 45 <xs:sequence>
46   - <xs:element name="representation" type="xs:anyType" minOccurs="0"/>
  46 + <xs:element name="representation" type="m2m:representation" minOccurs="0"/>
47 47 <xs:element name="operationMonitor" minOccurs="0">
48 48 <xs:complexType>
49 49 <xs:sequence>
... ... @@ -56,12 +56,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
56 56 </xs:sequence>
57 57 </xs:complexType>
58 58 </xs:element>
59   - <xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/>
60   - <xs:element name="subscriptionDeletion" type="xs:boolean" minOccurs="0"/>
61   - <xs:element name="subscriptionReference" type="xs:anyURI" minOccurs="0"/>
62   - <xs:element name="creator" type="m2m:ID" minOccurs="0"/>
63   - <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/>
64   - <xs:element name="IPEDiscoveryRequest" minOccurs="0">
  59 + <xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/>
  60 + <xs:element name="subscriptionDeletion" type="xs:boolean" minOccurs="0"/>
  61 + <xs:element name="subscriptionReference" type="xs:anyURI" minOccurs="0"/>
  62 + <xs:element name="creator" type="m2m:ID" minOccurs="0"/>
  63 + <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/>
  64 + <xs:element name="notificationTarget" type="m2m:ID" minOccurs="0"/>
  65 + <xs:element name="targetRemovalRequest" type="xs:boolean" minOccurs="0"/>
  66 + <xs:element name="targetRemovalAllowance" type="xs:boolean" minOccurs="0"/>
  67 + <xs:element name="IPEDiscoveryRequest" minOccurs="0">
65 68 <xs:complexType >
66 69 <xs:sequence>
67 70 <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
124 127 </xs:element>
125 128 </xs:sequence>
126 129 </xs:complexType>
  130 +
  131 + <xs:complexType name="representation">
  132 + <xs:choice minOccurs="0" >
  133 + <xs:any namespace="http://www.onem2m.org/xml/protocols" processContents="lax" />
  134 + <xs:any namespace="##other" processContents="lax" />
  135 + </xs:choice>
  136 + </xs:complexType>
127 137  
128 138 </xs:schema>
... ...
... ... @@ -55,6 +55,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
55 55 <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
56 56 <xs:element name="triggerReferenceNumber" type="xs:unsignedInt" minOccurs="0" />
57 57 <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
  58 + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
58 59  
59 60 <!-- Child Resources -->
60 61 <xs:choice minOccurs="0" maxOccurs="1">
... ... @@ -98,6 +99,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
98 99 <xs:element name="requestReachability" type="xs:boolean" minOccurs="0" />
99 100 <xs:element name="nodeLink" type="xs:anyURI" minOccurs="0" />
100 101 <xs:element name="e2eSecInfo" type="m2m:e2eSecInfo" minOccurs="0" />
  102 + <xs:element name="supportedReleaseVersions" type="m2m:supportedReleaseVersions" />
101 103  
102 104 <!-- Child Resources -->
103 105 <xs:choice minOccurs="0" maxOccurs="1">
... ...
... ... @@ -116,6 +116,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
116 116 </xs:element>
117 117 <!-- parameter "Token Request Indicator" -->
118 118 <xs:element name="tokenRequestIndicator" type="xs:boolean" minOccurs="0"/>
  119 + <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
119 120 </xs:sequence>
120 121 </xs:complexType>
121 122 </xs:element>
... ...
... ... @@ -106,7 +106,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
106 106 <!-- parameter "Assigned Token Identifiers -->
107 107 <xs:element name="assignedTokenIdentifiers" type="m2m:dynAuthLocalTokenIdAssignments" minOccurs="0" />
108 108 <!-- parameter "Token Request Information -->
109   - <xs:element name="tokenRequestInformation" type="m2m:dynAuthTokenReqInfo" minOccurs="0" />
  109 + <xs:element name="tokenRequestInformation" type="m2m:dynAuthTokenReqInfo" minOccurs="0" />
  110 + <xs:element name="releaseVersionIndicator" type="m2m:releaseVersion" minOccurs="1"/>
110 111 </xs:sequence>
111 112 </xs:complexType>
112 113 </xs:element>
... ...
... ... @@ -90,8 +90,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
90 90  
91 91 <xs:complexType name="batchNotify">
92 92 <xs:sequence>
93   - <xs:element name="number" type="xs:nonNegativeInteger" />
94   - <xs:element name="duration" type="xs:duration" />
  93 + <xs:element name="number" type="xs:nonNegativeInteger" minOccurs="0" />
  94 + <xs:element name="duration" type="xs:duration" minOccurs="0" />
95 95 </xs:sequence>
96 96 </xs:complexType>
97 97  
... ...