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

v3_10_0/CDT-commonTypes-v3_10_0.xsd

@@ -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="groupRequestIdentifier" type="xs:string" 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:simpleType>
 					<xs:restriction> 

v3_10_0/CDT-delivery-v3_10_0.xsd

@@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:extension base="m2m:regularResource">
 					<xs:sequence>
 						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						
 						<!-- Resource Specific Attributes -->
 						<xs:element name="source" type="m2m:ID" />
 						<xs:element name="target" type="m2m:ID" />

v3_10_0/CDT-enumerationTypes-v3_10_0.xsd

@@ -288,7 +288,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:restriction>
 	</xs:simpleType>
 
-	<xs:simpleType name="discResType">
+	<xs:simpleType name="desIdResType">
 		<xs:annotation>
 			<xs:documentation>Used in &lt;request&gt; </xs:documentation>
 		</xs:annotation>
@@ -379,6 +379,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:enumeration value="4122" />    
 			<!-- ILLEGAL_TRANSACTION_STATE_TRANSITION_ATTEMPTED -->
 			<xs:enumeration value="4123" />   
+			<!-- SPECIALIZATION_SCHEMA_NOT_FOUND -->
+			<xs:enumeration value="4124" />    
             <!-- INTERNAL_SERVER_ERROR     -->
             <xs:enumeration value="5000" />              
             <!-- NOT_IMPLEMENTED           -->

v3_10_0/CDT-multimediaSession-v3_10_0.xsd

@@ -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-subscription-v3_10_0.xsd" />
-	<xs:include schemaLocation="CDT-accessControlPolicy-v3_10_0.xsd" />
 	<xs:include schemaLocation="CDT-transaction-v3_10_0.xsd"/>
 
 	<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
 							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
 							<xs:choice minOccurs="1" maxOccurs="unbounded">
 								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:accessControlPolicy" />
 								<xs:element ref="m2m:transaction" />
 							</xs:choice>
 						</xs:choice>
@@ -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:choice minOccurs="1" maxOccurs="unbounded">
 								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:accessControlPolicy" />
-								<xs:element ref="m2m:accessControlPolicyAnnc" />
 								<xs:element ref="m2m:transaction" />
 							</xs:choice>
 						</xs:choice>

v3_10_0/CDT-request-v3_10_0.xsd

@@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:extension base="m2m:regularResource">
 					<xs:sequence>
 						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						
 						<!-- Resource Specific Attributes -->
 						<xs:element name="operation" type="m2m:operation" />
 						<xs:element name="target" type="xs:anyURI" />

v3_10_0/CDT-requestPrimitive-v3_10_0.xsd

@@ -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"/>        
           <!-- parameter "Filter Criteria" -->
           <xs:element name="filterCriteria" type="m2m:filterCriteria" minOccurs="0"/>
-          <!-- parameter "Discovery Result Type" -->
-          <xs:element name="discoveryResultType" type="m2m:discResType" minOccurs="0"/>
+          <!-- parameter "Desired Identifier Result Type" -->
+          <xs:element name="desiredIdentifierResultType" type="m2m:desIdResType" minOccurs="0"/>
           <!-- parameter "Tokens" -->
           <xs:element name="tokens" minOccurs="0">
             <xs:simpleType>

v3_10_0/CDT-schedule-v3_10_0.xsd

@@ -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-subscription-v3_10_0.xsd" />
 
-	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
+	<xs:element name="schedule" substitutionGroup="m2m:sg_announceableResource ">
 		<xs:complexType>
 			<xs:complexContent>
-				<xs:extension base="m2m:announceableSubordinateResource">
+				<xs:extension base="m2m:announceableResource ">
 					<xs:sequence>
 						<!-- Resource Specific Attributes -->
 						<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
 		</xs:complexType>
 	</xs:element>
 
-	<xs:element name="scheduleAnnc" substitutionGroup="m2m:sg_announcedSubordinateResource">
+	<xs:element name="scheduleAnnc" substitutionGroup="m2m:sg_announcedResource">
 		<xs:complexType>
 			<xs:complexContent>
-				<xs:extension base="m2m:announcedSubordinateResource">
+				<xs:extension base="m2m:announcedResource">
 					<xs:sequence>
 						<!-- Resource Specific Attributes -->
 						<xs:element name="scheduleElement" type="m2m:scheduleEntries" minOccurs="0" />

v3_10_0/CDT-timeSeries-v3_10_0.xsd

@@ -39,7 +39,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:extension base="m2m:announceableResource">
 					<xs:sequence>
 						<!-- 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" />
 						<!-- Resource Specific Attributes -->
 						<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
 				<xs:extension base="m2m:announcedResource">
 					<xs:sequence>
 						<!-- Common Attribute, specific to <container>, <contentInstance>, <request> and <delivery> resources -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" minOccurs="0" />
+						
 						<!-- Resource Specific Attributes -->
 						<xs:element name="maxNrOfInstances" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="maxByteSize" type="xs:nonNegativeInteger" minOccurs="0" />

v3_10_0/CDT-triggerRequest-v3_10_0.xsd

@@ -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="triggerInfoOperation" type="m2m:operation" minOccurs="0" />
 						<xs:element name="targetedResourceType" type="m2m:resourceType" minOccurs="0" />
-
+						<xs:element name="triggerReference" type="xs:string" minOccurs="0" />
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
 							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />