XSD v2_0_0 baseline

CDT-commonTypes.xsd

@@ -220,7 +220,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	<xs:simpleType name="scheduleEntry">
 		<xs:restriction base="xs:string">
 			<xs:pattern
-				value="(([*]|[1-5]?\d([,-][1-5]?\d)*)\s+){2}([*]|((1?\d|2[0-3])([,-](1?\d|2[0-3]))*))\s+([*]|(([1-9]|1\d|2\d|3[01])([,-]([1-9]|1\d|2\d|3[01]))*))\s+([*]|(([1-9]|1[0-2])([,-]([1-9]|1[0-2]))*))\s+([*]|([0-6]([,-][0-6])*))" />
+				value="(([*]|[1-5]?\d([,-/][1-5]?\d)*)\s+){2}([*]|((1?\d|2[0-3])([,-/](1?\d|2[0-3]))*))\s+([*]|(([1-9]|1\d|2\d|3[01])([,-/]([1-9]|1\d|2\d|3[01]))*))\s+([*]|(([1-9]|1[0-2])([,-/]([1-9]|1[0-2]))*))\s+([*]|([0-6]([,-/][0-6])*))\s+([*]|([2-9]\d\d\d)(([,-]([2-9]\d\d\d)([/][\d]?[\d]?[\d]?[\d])?)*))" /> 				
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -233,6 +233,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		</xs:restriction> 
 	</xs:simpleType>
 
+	<xs:simpleType name="listOfDuration">
+		<list itemType="xs:duration" />
+	</xs:simpleType>
 
 	<!--********************** -->
 	<!-- oneM2M Complex Types -->

CDT-locationPolicy.xsd

@@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<xs:sequence>
 						<!-- Resource Specific Attributes -->
 						<xs:element name="locationSource" type="m2m:locationSource" />
-						<xs:element name="locationUpdatePeriod" type="xs:duration" minOccurs="0" />
+						<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
 						<xs:element name="locationTargetID" type="m2m:nodeID" minOccurs="0" />
 						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />
@@ -66,7 +66,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<xs:sequence>
 						<!-- Resource Specific Attributes -->
 						<xs:element name="locationSource" type="m2m:locationSource" minOccurs="0" />
-						<xs:element name="locationUpdatePeriod" type="xs:duration" minOccurs="0" />
+						<xs:element name="locationUpdatePeriod" type="m2m:listOfDuration" minOccurs="0" />
 						<xs:element name="locationTargetID" type="m2m:nodeID" minOccurs="0" />
 						<xs:element name="locationServer" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="locationContainerID" type="xs:anyURI" minOccurs="0" />