delivery & request XSD: alignment w. #662R02

CDT-delivery-v0_8_0.xsd

@@ -38,23 +38,24 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:extension base="m2m:regularResource">
 					<xs:sequence>
 						<!-- Resource Specific Attributes -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
+						<!-- TODO: The type of source and target should match that of CSE-ID (i.e.they should have type m2m:ID) -->
 						<xs:element name="source" type="m2m:ID" />
 						<xs:element name="target" type="m2m:ID" />
-						<xs:element name="lifespan" type="xs:dateTime" />
+						<xs:element name="lifespan" type="m2m:timestamp" />
 						<xs:element name="eventCat" type="m2m:eventCat" />
 						<xs:element name="deliveryMetaData" type="m2m:deliveryMetaData" />
 						<xs:element name="aggregatedRequest" type="m2m:aggregatedRequest" />
 
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
-                            <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-                            <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+							<xs:choice minOccurs="1" maxOccurs="unbounded">
+								<xs:element ref="m2m:subscription"></xs:element>
+							</xs:choice>
 						</xs:choice>
 					</xs:sequence>
 				</xs:extension>
 			</xs:complexContent>
 		</xs:complexType>
 	</xs:element>
-	
 </xs:schema>
\ No newline at end of file

CDT-request-v0_8_0.xsd

@@ -37,7 +37,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 				<xs:extension base="m2m:regularResource">
 					<xs:sequence>
 						<!-- Resource Specific Attributes -->
-						<xs:element name="stateTag" type="xs:nonNegativeInteger" />
 						<xs:element name="operation" type="m2m:operation" />
 						<xs:element name="target" type="xs:anyURI" />
 						<xs:element name="originator" type="m2m:ID" />
@@ -49,8 +48,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 						<!-- Child Resources -->
 						<xs:choice minOccurs="0" maxOccurs="1">
-                            <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" />
-                            <xs:element ref="m2m:subscription" maxOccurs="unbounded" />
+							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
+							<xs:choice minOccurs="1" maxOccurs="unbounded">
+								<xs:element ref="m2m:subscription"></xs:element>
+							</xs:choice>
 						</xs:choice>
 					</xs:sequence>
 				</xs:extension>