Corrections agreed at TP#17

Changes resulting from agreed CRs included in
TP-2015--0719-CR_Pack_TS-0004-Release_1&2.ZIP.  NOTE:
PRO-2015-0795R02-CR_for_Response_Type_Info.DOC applies to Release-2 only
and is not implemented in this update.

v1_2_0/CDT-AE-v1_2_0.xsd

@@ -32,6 +32,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	<xs:include schemaLocation="CDT-accessControlPolicy-v1_2_0.xsd" />
 	<xs:include schemaLocation="CDT-subscription-v1_2_0.xsd" />
 	<xs:include schemaLocation="CDT-pollingChannel-v1_2_0.xsd" />
+	<xs:include schemaLocation="CDT-schedule-v1_2_0.xsd" />
 
 	<xs:element name="AE">
 		<xs:complexType>
@@ -57,6 +58,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 								<xs:element ref="m2m:accessControlPolicy" />
 								<xs:element ref="m2m:subscription" />
 								<xs:element ref="m2m:pollingChannel" />
+								<xs:element ref="m2m:schedule" />								
 							</xs:choice>
 						</xs:choice>
 					</xs:sequence>

v1_2_0/CDT-areaNwkDeviceInfo-v1_2_0.xsd

@@ -41,7 +41,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="areaNwkId" type="xs:anyURI" />
 						<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="status" type="xs:string" minOccurs="0" />
+						<xs:element name="devStatus" type="xs:string" minOccurs="0" />
 						<xs:element name="listOfNeighbors" type="m2m:listOfURIs" />
 		     
 						<!-- Child Resources -->
@@ -67,7 +67,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="areaNwkId" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="sleepInterval" type="xs:nonNegativeInteger" minOccurs="0" />
 						<xs:element name="sleepDuration" type="xs:nonNegativeInteger" minOccurs="0" />
-						<xs:element name="status" type="xs:string" minOccurs="0" />
+						<xs:element name="devStatus" type="xs:string" minOccurs="0" />
 						<xs:element name="listOfNeighbors" type="m2m:listOfURIs" minOccurs="0" />
 		     
 						<!-- Child Resources -->

v1_2_0/CDT-cmdhPolicy-v1_2_0.xsd

@@ -37,7 +37,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
           <xs:extension base="m2m:mgmtResource">
 	        <xs:sequence>
            <!-- mgmtObj specialization-specific Attributes -->
-              <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" />
+              <xs:element name="cmdhPolicyName" type="xs:string" minOccurs="1" maxOccurs="1" />
 	          <!-- Instantiations of this [cmdhPolicy] resource type shall include mgmntLink's to
 	               the following children:
 	            1 mgmtLink to an instance of resource type [cmdhDefaults], 

v1_2_0/CDT-commonTypes-v1_2_0.xsd

@@ -212,7 +212,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="to" type="xs:anyURI" />
 						<xs:element name="from" type="m2m:ID" />
 						<xs:element name="requestIdentifier" type="m2m:requestID" />
-						<xs:element name="content" type="m2m:primitiveContent" minOccurs="0" />
+						<xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0" />
 						<xs:element name="metaInformation" type="m2m:metaInformation" minOccurs="0" />
 					</xs:sequence>
 				</xs:complexType>
@@ -223,13 +223,13 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	<xs:complexType name="metaInformation">
 		<xs:sequence>
 			<xs:element name="resourceType" type="m2m:resourceType" minOccurs="0" />
-			<xs:element name="name" type="xs:string" minOccurs="0" />
+			<xs:element name="name" type="xs:NCName" minOccurs="0" />
 			<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="requestExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="resultExpirationTimestamp" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="operationExecutionTime" type="m2m:timestamp" minOccurs="0" />
-			<xs:element name="responseType" type="m2m:responseType" minOccurs="0" />
-			<xs:element name="resultPersistence" type="m2m:timestamp" minOccurs="0" />
+			<xs:element name="responseType" type="m2m:responseTypeInfo" minOccurs="0" />
+			<xs:element name="resultPersistence" type="xs:duration" minOccurs="0" />
 			<xs:element name="resultContent" type="m2m:resultContent" minOccurs="0" />
 			<xs:element name="eventCategory" type="m2m:eventCat" minOccurs="0" />
 			<xs:element name="deliveryAggregation" type="xs:boolean" minOccurs="0" />
@@ -416,7 +416,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
     <xs:complexType name="responseTypeInfo">
         <xs:sequence>
-            <xs:element name="responseType" type="m2m:responseType" />
+            <xs:element name="responseTypeValue" type="m2m:responseType" />
             <xs:element name="notificationURI" type="xs:anyURI" minOccurs="0" maxOccurs="unbounded" />
         </xs:sequence>
     </xs:complexType>
@@ -427,7 +427,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 		<xs:sequence>
 			<xs:element name="responseStatusCode" type="m2m:responseStatusCode" />
 			<xs:element name="requestIdentifier" type="m2m:requestID" />			
-			<xs:element name="content" type="m2m:primitiveContent" minOccurs="0" />
+			<xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0" />
 			<xs:element name="to" type="xs:anyURI" minOccurs="0" />
 			<xs:element name="from" type="m2m:ID" minOccurs="0" />
 			<xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0" />
@@ -472,7 +472,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<xs:element name="announceTo" type="m2m:listOfURIs" minOccurs="0" />
 					<xs:element name="announcedAttribute" minOccurs="0">
 						<xs:simpleType>
-							<xs:list itemType="xs:token" />
+							<xs:list itemType="xs:NCName" />
 						</xs:simpleType>
 					</xs:element>
 				</xs:sequence>

v1_2_0/CDT-enumerationTypes-v1_2_0.xsd

@@ -207,12 +207,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:documentation>Used in &lt;request&gt; </xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:integer">
-			<!-- hierarchical -->
+			<!-- structured -->
 			<xs:enumeration value="1" />
-			<!-- Non-hierarchical -->
+			<!-- unstructured -->
 			<xs:enumeration value="2" />
-			<!-- cseID+resourceID -->
-			<xs:enumeration value="3" />
 		</xs:restriction>
 	</xs:simpleType>
 
@@ -229,7 +227,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
             <xs:enumeration value="2001" />         
             <!-- DELETED      -->
             <xs:enumeration value="2002" />
-            <!-- CHANGED      -->
+            <!-- UPDATED      -->
             <xs:enumeration value="2004" />
             <!-- BAD_REQUEST  -->
             <xs:enumeration value="4000" />            
@@ -287,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_ CANCELATION_FAILURE              -->
+            <!-- MGMT_ CANCELATION_FAILED              -->
             <xs:enumeration value="6026" />               
             <!-- ALREADY_COMPLETE                       -->
             <xs:enumeration value="6028" />               
@@ -528,27 +526,27 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:documentation></xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:integer">
-			<!-- modifiedAttributes -->
+			<!-- all attributes -->
 			<xs:enumeration value="1" />
-			<!-- wholeResource -->
+			<!-- modified attributes -->
 			<xs:enumeration value="2" />
-			<!-- referenceOnly -->
+			<!-- ResourceID -->
 			<xs:enumeration value="3" />
 		</xs:restriction>
 	</xs:simpleType>
 
-	<xs:simpleType name="resourceStatus">
+	<xs:simpleType name="notificationEventType">
 		<xs:annotation>
-			<xs:documentation></xs:documentation>
+			<xs:documentation>Used in the notificationEventType element of eventNotificationCriteria attribute of subscruiption resource</xs:documentation>
 		</xs:annotation>
 		<xs:restriction base="xs:integer">
-			<!-- childCreated -->
+			<!-- Update of Resource -->
 			<xs:enumeration value="1" />
-			<!-- childDeleted -->
+			<!-- Delete of Resource -->
 			<xs:enumeration value="2" />
-			<!-- updated -->
+			<!-- Create of Direct Child Resource -->
 			<xs:enumeration value="3" />
-			<!-- deleted -->
+			<!-- Delete of Direct Child Resource -->
 			<xs:enumeration value="4" />
 		</xs:restriction>
 	</xs:simpleType>
@@ -881,9 +879,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
             <xs:documentation>Used in filterCriteria</xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:integer">
-            <!-- Discovery Criteria -->
+            <!-- Discovery -->
             <xs:enumeration value="1" />
-            <!-- Event Notification Criteria -->
+            <!-- Conditional Retrieval -->
             <xs:enumeration value="2" />
         </xs:restriction>
     </xs:simpleType>

v1_2_0/CDT-firmware-v1_2_0.xsd

@@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<!-- Resource Specific Attributes -->
 					<xs:sequence>
 						<xs:element name="version" type="xs:string" />
-						<xs:element name="name" type="xs:string" />
+						<xs:element name="firmwareName" type="xs:string" />
 						<xs:element name="URL" type="xs:anyURI" />
 						<xs:element name="update" type="xs:boolean" />
 						<xs:element name="updateStatus" type="m2m:actionStatus" />
@@ -62,7 +62,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<!-- Resource Specific Attributes -->
 					<xs:sequence>
 						<xs:element name="version" type="xs:string" minOccurs="0" />
-						<xs:element name="name" type="xs:string" minOccurs="0" />
+						<xs:element name="firmwareName" type="xs:string" minOccurs="0" />
 						<xs:element name="URL" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="update" type="xs:boolean" minOccurs="0" />
 						<xs:element name="updateStatus" type="m2m:actionStatus" minOccurs="0" />

v1_2_0/CDT-notification-v1_2_0.xsd

@@ -44,7 +44,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
                             <xs:complexType >
                                 <xs:sequence>
                                       <xs:element name="representation" type="xs:anyType" minOccurs="0"/>
-                                      <xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0"/>
                                       <xs:element name="operationMonitor" minOccurs="0">
                                           <xs:complexType>
                                                <xs:sequence>

v1_2_0/CDT-remoteCSE-v1_2_0.xsd

@@ -27,8 +27,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 	elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
 	<xs:include schemaLocation="CDT-commonTypes-v1_2_0.xsd" />
-
-	<xs:include schemaLocation="CDT-AE-v1_2_0.xsd" />
 	<xs:include schemaLocation="CDT-container-v1_2_0.xsd" />
 	<xs:include schemaLocation="CDT-group-v1_2_0.xsd" />
 	<xs:include schemaLocation="CDT-accessControlPolicy-v1_2_0.xsd" />
@@ -58,7 +56,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
                         <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:AE" />
                                 <xs:element ref="m2m:container" />
                                 <xs:element ref="m2m:group" />
                                 <xs:element ref="m2m:accessControlPolicy" />
@@ -92,8 +89,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
                             <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" />
                             <xs:choice minOccurs="1" maxOccurs="unbounded">
                                 <xs:element ref="m2m:nodeAnnc" />
-                                <xs:element ref="m2m:AE" />
-                                <xs:element ref="m2m:AEAnnc" />
                                 <xs:element ref="m2m:container" />
                                 <xs:element ref="m2m:containerAnnc" />
                                 <xs:element ref="m2m:group" />

v1_2_0/CDT-request-v1_2_0.xsd

@@ -44,7 +44,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="originator" type="m2m:ID" />
 						<xs:element name="requestID" type="m2m:requestID" />
 						<xs:element name="metaInformation" type="m2m:metaInformation" />
-						<xs:element name="content" type="m2m:primitiveContent" />
+						<xs:element name="primitiveContent" type="m2m:primitiveContent" />
 						<xs:element name="requestStatus" type="m2m:requestStatus" />
 						<xs:element name="operationResult" type="m2m:operationResult" />
 

v1_2_0/CDT-requestPrimitive-v1_2_0.xsd

@@ -44,9 +44,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
           <!-- parameter "ResourceType" -->
           <xs:element name="resourceType" type="m2m:resourceType" minOccurs="0"/>
           <!-- parameter "Name" -->
-          <xs:element name="name" type="xs:string" minOccurs="0"/>
-          <!-- parameter "Content" (of the primitive)-->
-          <xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/> 
+          <xs:element name="name" type="xs:NCName" minOccurs="0"/>
+          <!-- parameter "primitiveContent" -->
+          <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/> 
           <!-- parameter "Originating Timestamp" -->
           <xs:element name="originatingTimestamp" type="m2m:timestamp" minOccurs="0"/>
           <!-- parameter "Request Expiration Timestamp" -->

v1_2_0/CDT-responsePrimitive-v1_2_0.xsd

@@ -39,8 +39,8 @@ 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" (of the primitive) -->
-          <xs:element name="content" type="m2m:primitiveContent" minOccurs="0"/>
+          <!-- parameter "primitiveContent" -->
+          <xs:element name="primitiveContent" type="m2m:primitiveContent" minOccurs="0"/>
           <!-- parameter "To" -->
           <xs:element name="to" type="m2m:ID" minOccurs="0"/>
           <!-- parameter "From" -->

v1_2_0/CDT-software-v1_2_0.xsd

@@ -38,7 +38,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<!-- Resource Specific Attributes -->
 					<xs:sequence>
 						<xs:element name="version" type="xs:string" />
-						<xs:element name="name" type="xs:string" />
+						<xs:element name="softwareName" type="xs:string" />
 						<xs:element name="URL" type="xs:anyURI" />
 						<xs:element name="install" type="xs:boolean" />
 						<xs:element name="uninstall" type="xs:boolean" />
@@ -66,7 +66,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 					<!-- Resource Specific Attributes -->
 					<xs:sequence>
 						<xs:element name="version" type="xs:string" minOccurs="0" />
-						<xs:element name="name" type="xs:string" minOccurs="0" />
+						<xs:element name="softwareName" type="xs:string" minOccurs="0" />
 						<xs:element name="URL" type="xs:anyURI" minOccurs="0" />
 						<xs:element name="install" type="xs:boolean" minOccurs="0" />
 						<xs:element name="uninstall" type="xs:boolean" minOccurs="0" />

v1_2_0/CDT-subscription-v1_2_0.xsd

@@ -76,9 +76,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 			<xs:element name="expireAfter" type="m2m:timestamp" minOccurs="0" />
 			<xs:element name="sizeAbove" type="xs:nonNegativeInteger" minOccurs="0" />
 			<xs:element name="sizeBelow" type="xs:positiveInteger" minOccurs="0" />
-			<xs:element name="resourceStatus" type="m2m:resourceStatus" minOccurs="0" maxOccurs="unbounded" />
 			<xs:element name="operationMonitor" type="m2m:operation" minOccurs="0" maxOccurs="unbounded" />
 			<xs:element name="attribute" type="m2m:attribute" minOccurs="0" maxOccurs="unbounded" />
+			<xs:element name="notificationEventType" type="m2m:notificationEventType" minOccurs="0" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>