XSD v1_7_0 baseline

CDT-commonTypes.xsd

@@ -258,6 +258,14 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		<list itemType="xs:NCName" />
 	</xs:simpleType>
 
+	<xs:simpleType name="resourceTypeList">
+		<xs:restriction> 
+			<xs:simpleType> 
+				<xs:list itemType="m2m:resourceType" />
+			</xs:simpleType> 	
+			<xs:minLength value="1" /> 
+		</xs:restriction> 
+	</xs:simpleType>
 
 	<!--********************** -->
 	<!-- oneM2M Complex Types -->
@@ -328,7 +336,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:element name="expireBefore" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="labels" type="m2m:labels" minOccurs="0" />
-			<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
+			<xs:element name="resourceType" type="m2m:resourceTypeList" minOccurs="0" />
 			<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
 			<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
 			<xs:element name="contentType" type="m2m:typeOfContent" minOccurs="0" maxOccurs="unbounded" />
@@ -586,6 +594,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:complexContent>
 	</xs:complexType>
 	
+	<xs:complexType name="subordinateResource">
+		<xs:complexContent>
+			<xs:extension base="m2m:resource">
+				<xs:sequence>
+					<xs:element name="expirationTime" type="m2m:timestamp" />
+				</xs:sequence>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+
 	<xs:complexType name="announcedSubordinateResource">
 		<xs:complexContent>
 			<xs:extension base="m2m:resource">

CDT-pollingChannel.xsd

@@ -34,7 +34,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		<xs:complexType>
 			<xs:complexContent>
 				<!-- Inherit common attributes -->
-				<xs:extension base="m2m:regularResource">
+				<xs:extension base="m2m:subordinateResource">
 					<xs:sequence>
 						<!-- No Resource Specific Attributes -->
 

CDT-responsePrimitive.xsd

@@ -155,7 +155,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         <xs:element ref="m2m:statsConfig" />
         <xs:element ref="m2m:subscription" />
       </xs:choice>
-      <xs:element name="URIList" type="m2m:listOfURIs" />		
+      <xs:element name="URI" type="xs:anyURI" />		
     </xs:sequence>	
   </xs:complexType>