XSD v3_30_0 baseline

CDT-enumerationTypes.xsd

@@ -141,9 +141,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:enumeration value="10003" />
 			<!-- contentInstanceAnnc -->
 			<xs:enumeration value="10004" />
-			<!-- CSEBaseAnnc -->
-			<xs:enumeration value="10005" />
 			<!-- groupAnnc -->
+			<xs:enumeration value="10005" />
+			<!-- CSEBaseAnnc -->
 			<xs:enumeration value="10009" />
 			<!-- locationPolicyAnnc -->
 			<xs:enumeration value="10010" />
@@ -344,7 +344,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:enumeration value="4104" />
 			<!-- CONFLICT  -->
 			<xs:enumeration value="4105" />
-			<!-- ORIGINATOR_HAS_NOT_REGISTERED -->
+			<!-- ORIGINATOR_NOT_AUTHENTICATED -->
 			<xs:enumeration value="4106" /> 
 			<!-- SECURITY_ASSOCIATION_REQUIRED -->
 			<xs:enumeration value="4107" /> 
@@ -522,7 +522,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:enumeration value="9" />
 			<!-- locationPolicy --> 
 			<xs:enumeration value="10" />
-			<!-- m2mServiceSubscription -->
+			<!-- m2mServiceSubscriptionProfile -->
 			<xs:enumeration value="11" />
 			<!-- mgmtCmd -->
 			<xs:enumeration value="12" />

CDT-mgmtCmd.xsd

@@ -49,7 +49,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="execNumber" type="xs:nonNegativeInteger" minOccurs="0" />
 
 						<!-- Child Resources -->
-						<xs:choice minOccurs="1" maxOccurs="1">
+						<xs:choice minOccurs="0" maxOccurs="1">
 							<xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
 							<xs:choice minOccurs="1" maxOccurs="unbounded">
 								<xs:element ref="m2m:execInstance" />

CDT-notification.xsd

@@ -58,7 +58,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
                         </xs:element>                      
                     <xs:element name="verificationRequest" type="xs:boolean" minOccurs="0"/>
                     <xs:element name="subscriptionDeletion" type="xs:boolean" minOccurs="0"/>
-                    <xs:element name="subscriptionReference" type="xs:anyURI" minOccurs="0"/>
+                    <xs:element name="subscriptionReference" type="xs:anyURI" />
                     <xs:element name="creator" type="m2m:ID" minOccurs="0"/>
                     <xs:element name="notificationForwardingURI" type="xs:anyURI" minOccurs="0"/>
                     <xs:element name="notificationTarget" type="m2m:ID" minOccurs="0"/>

CDT-timeSeriesNotification.xsd

@@ -29,14 +29,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 	<xs:include schemaLocation="CDT-commonTypes.xsd" />
 	
-	<xs:element name="timeSeriesNotification">
-		<xs:complexType>
+	<xs:element name="timeSeriesNotification" type="m2m:timeSeriesNotificationType" />
+
+	<xs:complexType name="timeSeriesNotificationType" >
 		<xs:sequence>
 			<xs:element name="missingDataList" type="m2m:missingDataList"/>
 			<xs:element name="missingDataCurrentNr" type="xs:nonNegativeInteger"/>
 		</xs:sequence>
 	</xs:complexType>
-	</xs:element>
+
 	
 </xs:schema>