XSD v1_6_0 baseline

CDT-enumerationTypes.xsd

@@ -363,6 +363,26 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
             <xs:enumeration value="22" />
             <!-- subscription -->
             <xs:enumeration value="23" />			
+			<!-- accessControlPolicyAnnc -->
+			<xs:enumeration value="10001" />
+			<!-- AEAnnc -->
+			<xs:enumeration value="10002" />
+			<!-- containerAnnc -->
+			<xs:enumeration value="10003" />
+			<!-- contentInstanceAnnc -->
+			<xs:enumeration value="10004" />
+			<!-- groupAnnc -->
+			<xs:enumeration value="10009" />
+			<!-- locationPolicyAnnc -->
+			<xs:enumeration value="10010" />
+			<!-- mgmtObjAnnc -->
+			<xs:enumeration value="10013" />
+			<!-- nodeAnnc -->
+			<xs:enumeration value="10014" />
+			<!-- remoteCSEAnnc -->
+			<xs:enumeration value="10016" />
+			<!-- scheduleAnnc -->
+			<xs:enumeration value="10018" />
 		
 			<!-- Mixed -->
 			<xs:enumeration value="24" />

CDT-node.xsd

@@ -81,7 +81,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
         <xs:complexType>
             <xs:complexContent>
                 <!-- Inherit common attributes for announceable Resources -->
-                <xs:extension base="m2m:announceableResource">
+                <xs:extension base="m2m:announcedResource">
                     <!-- Resource Specific Attributes -->
                     <xs:sequence>
                         <xs:element name="nodeID" type="m2m:nodeID" />