diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd
index da893a4bbbb77a843f59e84ea704f70b69d49c66..67010ab4867e4edb8993147bb64dea12914e4ecf 100644
--- a/CDT-commonTypes.xsd
+++ b/CDT-commonTypes.xsd
@@ -232,6 +232,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:minLength value="1" />
</xs:restriction>
</xs:simpleType>
+
+ <xs:simpleType name="attributeList">
+ <list itemType="xs:NCName" />
+ </xs:simpleType>
<!--********************** -->
@@ -320,12 +324,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:sequence>
</xs:complexType>
- <xs:complexType name="attributeList">
- <xs:sequence>
- <xs:element name="attribute" type="m2m:attribute" maxOccurs="unbounded" />
- </xs:sequence>
- </xs:complexType>
-
<xs:complexType name="scheduleEntries">
<xs:sequence>
<xs:element name="scheduleEntry" type="m2m:scheduleEntry" maxOccurs="unbounded" />
@@ -440,13 +438,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
</xs:simpleContent>
</xs:complexType>
- <xs:complexType name="resourceWrapper">
- <xs:complexContent>
- <xs:extension base="m2m:resource">
- <xs:attribute name="URI" type="xs:anyURI" use="required" />
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
+ <!-- m2m:resourceWrapper is defined in the responsePrimitive xsd file -->
<!-- m2m:accessControlRule and m2m:locationRegion are defined in the accessControlPolicy xsd file -->
diff --git a/CDT-enumerationTypes.xsd b/CDT-enumerationTypes.xsd
index c94309bb8d9a9141b5bb8ef0bc07495438e23f2d..4b65c8cb654ec3376592f3ed61e6d5e859fdcd44 100644
--- a/CDT-enumerationTypes.xsd
+++ b/CDT-enumerationTypes.xsd
@@ -478,10 +478,6 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:enumeration value="15" />
<!-- STATUS_FILE_TRANSFER_FILE_AUTHENTICATION_FAILURE -->
<xs:enumeration value="16" />
- <!-- STATUS_FILE_TRANSFER_FAILED -->
- <xs:enumeration value="17" />
- <!-- STATUS_FILE_TRANSFER_SERVER_AUTHENTICATION_FAILURE -->
- <xs:enumeration value="18" />
<!-- STATUS_FILE_TRANSFER_WINDOW_EXCEEDED -->
<xs:enumeration value="19" />
<!-- STATUS_INVALID_UUID_FORMAT -->
diff --git a/CDT-responsePrimitive.xsd b/CDT-responsePrimitive.xsd
index f8428b55699cb5faa67c73a12cb1f22d8b18bd93..9bcbd03feb3c8c90b310e6035bdf6cb4140571d3 100644
--- a/CDT-responsePrimitive.xsd
+++ b/CDT-responsePrimitive.xsd
@@ -29,7 +29,51 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
<xs:include schemaLocation="CDT-commonTypes.xsd" />
-
+ <xs:include schemaLocation="CDT-accessControlPolicy.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy.xsd" />
+ <xs:include schemaLocation="CDT-AE.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo.xsd" />
+ <xs:include schemaLocation="CDT-battery.xsd" />
+ <xs:include schemaLocation="CDT-cmdhBuffer.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefaults.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefEcValue.xsd" />
+ <xs:include schemaLocation="CDT-cmdhEcDefParamValues.xsd" />
+ <xs:include schemaLocation="CDT-cmdhLimits.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNetworkAccessRules.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNwAccessRule.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy.xsd" />
+ <xs:include schemaLocation="CDT-container.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance.xsd" />
+ <xs:include schemaLocation="CDT-CSEBase.xsd" />
+ <xs:include schemaLocation="CDT-delivery.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig.xsd" />
+ <xs:include schemaLocation="CDT-eventLog.xsd" />
+ <xs:include schemaLocation="CDT-execInstance.xsd" />
+ <xs:include schemaLocation="CDT-firmware.xsd" />
+ <xs:include schemaLocation="CDT-group.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile.xsd" />
+ <xs:include schemaLocation="CDT-memory.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd.xsd" />
+ <xs:include schemaLocation="CDT-node.xsd" />
+ <xs:include schemaLocation="CDT-notification.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel.xsd" />
+ <xs:include schemaLocation="CDT-reboot.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE.xsd" />
+ <xs:include schemaLocation="CDT-request.xsd" />
+ <xs:include schemaLocation="CDT-requestPrimitive.xsd" />
+ <xs:include schemaLocation="CDT-responsePrimitive.xsd" />
+ <xs:include schemaLocation="CDT-schedule.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode.xsd" />
+ <xs:include schemaLocation="CDT-software.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig.xsd" />
+ <xs:include schemaLocation="CDT-subscription.xsd" />
+
<xs:element name="responsePrimitive" >
<xs:complexType>
<xs:sequence>
@@ -58,9 +102,63 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:element name="resource" type="m2m:resourceWrapper" />
<xs:element name="URIList" type="m2m:listOfURIs" />
+
+ <xs:element name="URI" type="xs:anyURI" />
<xs:element name="aggregatedResponse" type="m2m:aggregatedResponse" />
+ <xs:complexType name="resourceWrapper">
+ <xs:sequence>
+ <xs:choice minOccurs="1" maxOccurs="1">
+ <xs:element ref="m2m:accessControlPolicy" />
+ <xs:element ref="m2m:activeCmdhPolicy" />
+ <xs:element ref="m2m:AE" />
+ <xs:element ref="m2m:areaNwkDeviceInfo" />
+ <xs:element ref="m2m:areaNwkInfo" />
+ <xs:element ref="m2m:battery" />
+ <xs:element ref="m2m:cmdhBuffer" />
+ <xs:element ref="m2m:cmdhDefaults" />
+ <xs:element ref="m2m:cmdhDefEcValue" />
+ <xs:element ref="m2m:cmdhEcDefParamValues" />
+ <xs:element ref="m2m:cmdhLimits" />
+ <xs:element ref="m2m:cmdhNetworkAccessRules" />
+ <xs:element ref="m2m:cmdhNwAccessRule" />
+ <xs:element ref="m2m:cmdhPolicy" />
+ <xs:element ref="m2m:container" />
+ <xs:element ref="m2m:contentInstance" />
+ <xs:element ref="m2m:CSEBase" />
+ <xs:element ref="m2m:delivery" />
+ <xs:element ref="m2m:deviceCapability" />
+ <xs:element ref="m2m:deviceInfo" />
+ <xs:element ref="m2m:eventConfig" />
+ <xs:element ref="m2m:eventLog" />
+ <xs:element ref="m2m:execInstance" />
+ <xs:element ref="m2m:firmware" />
+ <xs:element ref="m2m:group" />
+ <xs:element ref="m2m:locationPolicy" />
+ <xs:element ref="m2m:m2mServiceSubscriptionProfile" />
+ <xs:element ref="m2m:memory" />
+ <xs:element ref="m2m:mgmtCmd" />
+ <xs:element ref="m2m:node" />
+ <xs:element ref="m2m:notification" />
+ <xs:element ref="m2m:pollingChannel" />
+ <xs:element ref="m2m:reboot" />
+ <xs:element ref="m2m:remoteCSE" />
+ <xs:element ref="m2m:request" />
+ <xs:element ref="m2m:requestPrimitive" />
+ <xs:element ref="m2m:responsePrimitive" />
+ <xs:element ref="m2m:schedule" />
+ <xs:element ref="m2m:serviceSubscribedAppRule" />
+ <xs:element ref="m2m:serviceSubscribedNode" />
+ <xs:element ref="m2m:software" />
+ <xs:element ref="m2m:statsCollect" />
+ <xs:element ref="m2m:statsConfig" />
+ <xs:element ref="m2m:subscription" />
+ </xs:choice>
+ <xs:element name="URIList" type="m2m:listOfURIs" />
+ </xs:sequence>
+ </xs:complexType>
+
<xs:complexType name="aggregatedResponse">
<xs:sequence>