Revert "Further TP#17 corrections"

This reverts commit eaf94fe4.

v1_2_0/CDT-AE-v1_2_0.xsd

@@ -93,7 +93,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 								<xs:element ref="m2m:accessControlPolicy" />
 								<xs:element ref="m2m:accessControlPolicyAnnc" />
 								<xs:element ref="m2m:subscription" />
-								<xs:element ref="m2m:scheduleAnnc" />
+								<xs:element ref="m2m:pollingChannel" />
 							</xs:choice>
 						</xs:choice>
 					</xs:sequence>

v1_2_0/CDT-commonTypes-v1_2_0.xsd

@@ -62,7 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	</xs:simpleType>
 	
 	 <xs:simpleType name="acpType">
-        <list itemType="m2m:ID" />
+        <list itemType="xs:anyURI" />
     </xs:simpleType>
 
 	<xs:simpleType name="labels">

v1_2_0/CDT-enumerationTypes-v1_2_0.xsd

@@ -275,7 +275,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
             <xs:enumeration value="6011" />               
             <!-- MGMT_SESSION_CANNOT_BE_ESTABLISHED     -->
             <xs:enumeration value="6020" />               
-            <!-- MGMT_SESSION_ESTABLISHMENT_TIMEOUT     -->
+            <!-- MGMT_SESSION_ESTABLISHMENT _TIMEOUT    -->
             <xs:enumeration value="6021" />               
             <!-- INVALID_CMDTYPE                        -->
             <xs:enumeration value="6022" />               
@@ -285,7 +285,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
             <xs:enumeration value="6024" />               
             <!-- MGMT_ CONVERSION_ERROR                 -->
             <xs:enumeration value="6025" />               
-            <!-- MGMT_ CANCELLATION_FAILED              -->
+            <!-- MGMT_ CANCELATION_FAILED              -->
             <xs:enumeration value="6026" />               
             <!-- ALREADY_COMPLETE                       -->
             <xs:enumeration value="6028" />               

v1_2_0/CDT-requestPrimitive-v1_2_0.xsd

@@ -45,7 +45,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
           <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
           <!-- parameter "Name" -->
           <xs:element name="name" type="xs:NCName" minOccurs="0"/>
-          <!-- parameter "Content" -->
+          <!-- parameter "primitiveContent" -->
           <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/> 
           <!-- parameter "Originating Timestamp" -->
           <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>

v1_2_0/CDT-responsePrimitive-v1_2_0.xsd

@@ -39,7 +39,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
           <xs:element name="responseStatusCode" type="m2m:responseStatusCode" minOccurs="1"/>
           <!-- parameter "Request Identifier" -->
           <xs:element name="requestIdentifier" type="m2m:requestID" minOccurs="1"/> 
-          <!-- parameter "Content" -->
+          <!-- parameter "primitiveContent" -->
           <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/>
           <!-- parameter "To" -->
           <xs:element name="to" type="m2m:ID" minOccurs="0"/>