diff --git a/CDT-commonTypes.xsd b/CDT-commonTypes.xsd index f72cf637035984e70219ce365a1798d107152a5b..52475fd4739be71afffbad663481cec01544c342 100644 --- a/CDT-commonTypes.xsd +++ b/CDT-commonTypes.xsd @@ -1544,7 +1544,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <xs:element name="evalCriteria" type="m2m:evalCriteria" minOccurs="1" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> - + + <!-- m2m:aggregatedRequestPrimitives is in the CDT-requestPrimitive xsd file --> + <!-- Resource type definitions. These types include the "common attributes" that are used by oneM2M Resources. Each oneM2M Resource has a resource type that is defined in a separate schema, but each resource type extends one of the types that is defined below --> diff --git a/CDT-pollingChannel.xsd b/CDT-pollingChannel.xsd index 7c039b5b255d196235da52c04d5068bad76878f0..7bae087175242e82a92e1c1b094266b4de6ca896 100644 --- a/CDT-pollingChannel.xsd +++ b/CDT-pollingChannel.xsd @@ -37,8 +37,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR <!-- Inherit common attributes --> <xs:extension base="m2m:subordinateResource"> <xs:sequence> - <!-- No Resource Specific Attributes --> - + <!-- Resource Specific Attributes --> + <xs:element name="requestAggregation" type="xs:boolean" minOccurs="0" /> <!-- Child Resources --> <xs:choice minOccurs="0" maxOccurs="1"> <xs:element name="childResource" type="m2m:childResourceRef" minOccurs="1" maxOccurs="unbounded" /> diff --git a/CDT-requestPrimitive.xsd b/CDT-requestPrimitive.xsd index 2784f32d1a79aa3fbde516d50ddce39cfc5a5ac5..62e638aedc9a8294f97dfaac2d6a3115eb2dfaa4 100644 --- a/CDT-requestPrimitive.xsd +++ b/CDT-requestPrimitive.xsd @@ -143,6 +143,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR </xs:complexType> <xs:element name="attributeList" type="m2m:attributeList" /> + + <xs:complexType name="aggregatedRequestPrimitives"> + <xs:sequence> + <xs:element ref="m2m:requestPrimitive" minOccurs="1" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> </xs:schema>