PRO / XSD · Commits

Commit 79ceeabf355825be87ccd3708c502ea71c204164

Authored by Wolfgang Granzow
1 parent 9726d2dc

Changes agreed at PRO#38/TP#38 for Rel-3 

See deteiled list of changes in PRO-2019-0001-PRO38_changes_of_XML_schemas_to_align_with_TS-0004
Inline Side-by-side
Showing 9 changed files with 15 additions and 18 deletions
@@ -558,7 +558,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR @@ -558,7 +558,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
558 <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" /> 558 <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" />
559 <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" /> 559 <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" />
560 <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" /> 560 <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" />
561 - <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0" /> 561 + <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0" />
562 <xs:element name="roleIDs" minOccurs="0"> 562 <xs:element name="roleIDs" minOccurs="0">
563 <xs:simpleType> 563 <xs:simpleType>
564 <xs:restriction> 564 <xs:restriction>
@@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR @@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
38 <xs:extension base="m2m:regularResource"> 38 <xs:extension base="m2m:regularResource">
39 <xs:sequence> 39 <xs:sequence>
40 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources --> 40 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
41 - <xs:element name="stateTag" type="xs:nonNegativeInteger" /> 41 +
42 <!-- Resource Specific Attributes --> 42 <!-- Resource Specific Attributes -->
43 <xs:element name="source" type="m2m:ID" /> 43 <xs:element name="source" type="m2m:ID" />
44 <xs:element name="target" type="m2m:ID" /> 44 <xs:element name="target" type="m2m:ID" />
@@ -288,7 +288,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR @@ -288,7 +288,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
288 </xs:restriction> 288 </xs:restriction>
289 </xs:simpleType> 289 </xs:simpleType>
290 290
291 - <xs:simpleType name="discResType"> 291 + <xs:simpleType name="desIdResType">
292 <xs:annotation> 292 <xs:annotation>
293 <xs:documentation>Used in &lt;request&gt; </xs:documentation> 293 <xs:documentation>Used in &lt;request&gt; </xs:documentation>
294 </xs:annotation> 294 </xs:annotation>
@@ -378,7 +378,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR @@ -378,7 +378,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
378 <!-- INVALID_TRIGGER_PURPOSE --> 378 <!-- INVALID_TRIGGER_PURPOSE -->
379 <xs:enumeration value="4122" /> 379 <xs:enumeration value="4122" />
380 <!-- ILLEGAL_TRANSACTION_STATE_TRANSITION_ATTEMPTED --> 380 <!-- ILLEGAL_TRANSACTION_STATE_TRANSITION_ATTEMPTED -->
381 - <xs:enumeration value="4123" /> 381 + <xs:enumeration value="4123" />
  382 + <!-- SPECIALIZATION_SCHEMA_NOT_FOUND -->
  383 + <xs:enumeration value="4124" />
382 <!-- INTERNAL_SERVER_ERROR --> 384 <!-- INTERNAL_SERVER_ERROR -->
383 <xs:enumeration value="5000" /> 385 <xs:enumeration value="5000" />
384 <!-- NOT_IMPLEMENTED --> 386 <!-- NOT_IMPLEMENTED -->
@@ -29,7 +29,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR @@ -29,7 +29,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
29 29
30 <xs:include schemaLocation="CDT-commonTypes-v3_10_0.xsd" /> 30 <xs:include schemaLocation="CDT-commonTypes-v3_10_0.xsd" />
31 <xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" /> 31 <xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
32 - <xs:include schemaLocation="CDT-accessControlPolicy-v3_10_0.xsd" />  
33 <xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/> 32 <xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
34 33
35 <xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource"> 34 <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 @@ -49,7 +48,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
49 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> 48 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
50 <xs:choice minOccurs="1" maxOccurs="unbounded"> 49 <xs:choice minOccurs="1" maxOccurs="unbounded">
51 <xs:element ref="m2m:subscription" /> 50 <xs:element ref="m2m:subscription" />
52 - <xs:element ref="m2m:accessControlPolicy" />  
53 <xs:element ref="m2m:transaction" /> 51 <xs:element ref="m2m:transaction" />
54 </xs:choice> 52 </xs:choice>
55 </xs:choice> 53 </xs:choice>
@@ -74,8 +72,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR @@ -74,8 +72,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
74 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> 72 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
75 <xs:choice minOccurs="1" maxOccurs="unbounded"> 73 <xs:choice minOccurs="1" maxOccurs="unbounded">
76 <xs:element ref="m2m:subscription" /> 74 <xs:element ref="m2m:subscription" />
77 - <xs:element ref="m2m:accessControlPolicy" />  
78 - <xs:element ref="m2m:accessControlPolicyAnnc" />  
79 <xs:element ref="m2m:transaction" /> 75 <xs:element ref="m2m:transaction" />
80 </xs:choice> 76 </xs:choice>
81 </xs:choice> 77 </xs:choice>
@@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR @@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
37 <xs:extension base="m2m:regularResource"> 37 <xs:extension base="m2m:regularResource">
38 <xs:sequence> 38 <xs:sequence>
39 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources --> 39 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
40 - <xs:element name="stateTag" type="xs:nonNegativeInteger" /> 40 +
41 <!-- Resource Specific Attributes --> 41 <!-- Resource Specific Attributes -->
42 <xs:element name="operation" type="m2m:operation" /> 42 <xs:element name="operation" type="m2m:operation" />
43 <xs:element name="target" type="xs:anyURI" /> 43 <xs:element name="target" type="xs:anyURI" />
@@ -79,8 +79,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR @@ -79,8 +79,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
79 <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/> 79 <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/>
80 <!-- parameter "Filter Criteria" --> 80 <!-- parameter "Filter Criteria" -->
81 <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/> 81 <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
82 - <!-- parameter "Discovery Result Type" -->  
83 - <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/> 82 + <!-- parameter "Desired Identifier Result Type" -->
  83 + <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0"/>
84 <!-- parameter "Tokens" --> 84 <!-- parameter "Tokens" -->
85 <xs:element name="tokens" minOccurs="0"> 85 <xs:element name="tokens" minOccurs="0">
86 <xs:simpleType> 86 <xs:simpleType>
@@ -30,10 +30,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR @@ -30,10 +30,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
30 <xs:include schemaLocation="CDT-commonTypes-v3_10_0.xsd" /> 30 <xs:include schemaLocation="CDT-commonTypes-v3_10_0.xsd" />
31 <xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" /> 31 <xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
32 32
33 - <xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource"> 33 + <xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource ">
34 <xs:complexType> 34 <xs:complexType>
35 <xs:complexContent> 35 <xs:complexContent>
36 - <xs:extension base="m2m:announceableSubordinateResource"> 36 + <xs:extension base="m2m:announceableResource ">
37 <xs:sequence> 37 <xs:sequence>
38 <!-- Resource Specific Attributes --> 38 <!-- Resource Specific Attributes -->
39 <xs:element name="scheduleElement" type="m2m:scheduleEntries" /> 39 <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 @@ -53,10 +53,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
53 </xs:complexType> 53 </xs:complexType>
54 </xs:element> 54 </xs:element>
55 55
56 - <xs:element name="scheduleAnnc" substitutionGroup="m2m:sg_announcedSubordinateResource"> 56 + <xs:element name="scheduleAnnc" substitutionGroup="m2m:sg_announcedResource">
57 <xs:complexType> 57 <xs:complexType>
58 <xs:complexContent> 58 <xs:complexContent>
59 - <xs:extension base="m2m:announcedSubordinateResource"> 59 + <xs:extension base="m2m:announcedResource">
60 <xs:sequence> 60 <xs:sequence>
61 <!-- Resource Specific Attributes --> 61 <!-- Resource Specific Attributes -->
62 <xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" /> 62 <xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" />
@@ -39,7 +39,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR @@ -39,7 +39,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
39 <xs:extension base="m2m:announceableResource"> 39 <xs:extension base="m2m:announceableResource">
40 <xs:sequence> 40 <xs:sequence>
41 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources --> 41 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
42 - <xs:element name="stateTag" type="xs:nonNegativeInteger" />  
43 <xs:element name="creator" type="m2m:ID" /> 42 <xs:element name="creator" type="m2m:ID" />
44 <!-- Resource Specific Attributes --> 43 <!-- Resource Specific Attributes -->
45 <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" /> 44 <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 @@ -77,7 +76,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
77 <xs:extension base="m2m:announcedResource"> 76 <xs:extension base="m2m:announcedResource">
78 <xs:sequence> 77 <xs:sequence>
79 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources --> 78 <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
80 - <xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" /> 79 +
81 <!-- Resource Specific Attributes --> 80 <!-- Resource Specific Attributes -->
82 <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" /> 81 <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
83 <xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" /> 82 <xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />
@@ -47,7 +47,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR @@ -47,7 +47,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
47 <xs:element name="triggerInfoAddress" type="xs:anyURI" minOccurs="0" /> 47 <xs:element name="triggerInfoAddress" type="xs:anyURI" minOccurs="0" />
48 <xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0" /> 48 <xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0" />
49 <xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0" /> 49 <xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0" />
50 - 50 + <xs:element name="triggerReference" type="xs:string" minOccurs="0" />
51 <!-- Child Resources --> 51 <!-- Child Resources -->
52 <xs:choice minOccurs="0" maxOccurs="1"> 52 <xs:choice minOccurs="0" maxOccurs="1">
53 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> 53 <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />