Commit 79ceeabf authored by Wolfgang Granzow's avatar Wolfgang Granzow

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
parent 9726d2dc
...@@ -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
<xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" /> <xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" />
<xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" /> <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0" />
<xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" /> <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0" />
<xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0" /> <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0" />
<xs:element name="roleIDs" minOccurs="0"> <xs:element name="roleIDs" minOccurs="0">
<xs:simpleType> <xs:simpleType>
<xs:restriction> <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
<xs:extension base="m2m:regularResource"> <xs:extension base="m2m:regularResource">
<xs:sequence> <xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources --> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" />
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="source" type="m2m:ID" /> <xs:element name="source" type="m2m:ID" />
<xs:element name="target" type="m2m:ID" /> <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
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>
<xs:simpleType name="discResType"> <xs:simpleType name="desIdResType">
<xs:annotation> <xs:annotation>
<xs:documentation>Used in &lt;request&gt; </xs:documentation> <xs:documentation>Used in &lt;request&gt; </xs:documentation>
</xs:annotation> </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
<!-- INVALID_TRIGGER_PURPOSE --> <!-- INVALID_TRIGGER_PURPOSE -->
<xs:enumeration value="4122" /> <xs:enumeration value="4122" />
<!-- ILLEGAL_TRANSACTION_STATE_TRANSITION_ATTEMPTED --> <!-- ILLEGAL_TRANSACTION_STATE_TRANSITION_ATTEMPTED -->
<xs:enumeration value="4123" /> <xs:enumeration value="4123" />
<!-- SPECIALIZATION_SCHEMA_NOT_FOUND -->
<xs:enumeration value="4124" />
<!-- INTERNAL_SERVER_ERROR --> <!-- INTERNAL_SERVER_ERROR -->
<xs:enumeration value="5000" /> <xs:enumeration value="5000" />
<!-- NOT_IMPLEMENTED --> <!-- 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
<xs:include schemaLocation="CDT-commonTypes-v3_10_0.xsd" /> <xs:include schemaLocation="CDT-commonTypes-v3_10_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" /> <xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
<xs:include schemaLocation="CDT-accessControlPolicy-v3_10_0.xsd" />
<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/> <xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
<xs:element name="multimediaSession" substitutionGroup="m2m:sg_announceableResource"> <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
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded"> <xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" /> <xs:element ref="m2m:subscription" />
<xs:element ref="m2m:accessControlPolicy" />
<xs:element ref="m2m:transaction" /> <xs:element ref="m2m:transaction" />
</xs:choice> </xs:choice>
</xs:choice> </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
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
<xs:choice minOccurs="1" maxOccurs="unbounded"> <xs:choice minOccurs="1" maxOccurs="unbounded">
<xs:element ref="m2m:subscription" /> <xs:element ref="m2m:subscription" />
<xs:element ref="m2m:accessControlPolicy" />
<xs:element ref="m2m:accessControlPolicyAnnc" />
<xs:element ref="m2m:transaction" /> <xs:element ref="m2m:transaction" />
</xs:choice> </xs:choice>
</xs:choice> </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
<xs:extension base="m2m:regularResource"> <xs:extension base="m2m:regularResource">
<xs:sequence> <xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources --> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" />
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="operation" type="m2m:operation" /> <xs:element name="operation" type="m2m:operation" />
<xs:element name="target" type="xs:anyURI" /> <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
<xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/> <xs:element name="groupRequestIdentifier" type="xs:string" minOccurs="0"/>
<!-- parameter "Filter Criteria" --> <!-- parameter "Filter Criteria" -->
<xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/> <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
<!-- parameter "Discovery Result Type" --> <!-- parameter "Desired Identifier Result Type" -->
<xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/> <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0"/>
<!-- parameter "Tokens" --> <!-- parameter "Tokens" -->
<xs:element name="tokens" minOccurs="0"> <xs:element name="tokens" minOccurs="0">
<xs:simpleType> <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
<xs:include schemaLocation="CDT-commonTypes-v3_10_0.xsd" /> <xs:include schemaLocation="CDT-commonTypes-v3_10_0.xsd" />
<xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" /> <xs:include schemaLocation="CDT-subscription-v3_10_0.xsd" />
<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource"> <xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource ">
<xs:complexType> <xs:complexType>
<xs:complexContent> <xs:complexContent>
<xs:extension base="m2m:announceableSubordinateResource"> <xs:extension base="m2m:announceableResource ">
<xs:sequence> <xs:sequence>
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="scheduleElement" type="m2m:scheduleEntries" /> <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
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="scheduleAnnc" substitutionGroup="m2m:sg_announcedSubordinateResource"> <xs:element name="scheduleAnnc" substitutionGroup="m2m:sg_announcedResource">
<xs:complexType> <xs:complexType>
<xs:complexContent> <xs:complexContent>
<xs:extension base="m2m:announcedSubordinateResource"> <xs:extension base="m2m:announcedResource">
<xs:sequence> <xs:sequence>
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" /> <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
<xs:extension base="m2m:announceableResource"> <xs:extension base="m2m:announceableResource">
<xs:sequence> <xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources --> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> and other resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" />
<xs:element name="creator" type="m2m:ID" /> <xs:element name="creator" type="m2m:ID" />
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" /> <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
<xs:extension base="m2m:announcedResource"> <xs:extension base="m2m:announcedResource">
<xs:sequence> <xs:sequence>
<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources --> <!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
<xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" />
<!-- Resource Specific Attributes --> <!-- Resource Specific Attributes -->
<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" /> <xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" /> <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
<xs:element name="triggerInfoAddress" type="xs:anyURI" minOccurs="0" /> <xs:element name="triggerInfoAddress" type="xs:anyURI" minOccurs="0" />
<xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0" /> <xs:element name="triggerInfoOperation" type="m2m:operation" minOccurs="0" />
<xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0" /> <xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0" />
<xs:element name="triggerReference" type="xs:string" minOccurs="0" />
<!-- Child Resources --> <!-- Child Resources -->
<xs:choice minOccurs="0" maxOccurs="1"> <xs:choice minOccurs="0" maxOccurs="1">
<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
......
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