From b9c332363dcd39a6ec4a26a057fb853cee9cb511 Mon Sep 17 00:00:00 2001 From: seeddn <dale.seed@interdigital.com> Date: Mon, 26 Jan 2015 19:39:50 -0500 Subject: [PATCH] Update CDT-deviceInfo-v0_8_0.xsd Added support for announce --- CDT-deviceInfo-v0_8_0.xsd | 76 +++++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 26 deletions(-) diff --git a/CDT-deviceInfo-v0_8_0.xsd b/CDT-deviceInfo-v0_8_0.xsd index 1036145..4449892 100644 --- a/CDT-deviceInfo-v0_8_0.xsd +++ b/CDT-deviceInfo-v0_8_0.xsd @@ -24,37 +24,61 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR --> <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols" - xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" - attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> + xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" + attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"> <xs:include schemaLocation="CDT-commonTypes-v0_8_0.xsd" /> <xs:include schemaLocation="CDT-subscription-v0_8_0.xsd" /> <xs:element name="deviceInfo"> - <xs:complexType> - <xs:complexContent> - <!-- Inherit common attributes from mgmtResource --> - <xs:extension base="m2m:mgmtResource"> - <xs:sequence> - <!-- Resource Specific Attributes --> - <xs:element name="deviceLabel" type="xs:string" /> - <xs:element name="manufacturer" type="xs:string" /> - <xs:element name="model" type="xs:string" /> - <xs:element name="deviceType" type="xs:string" /> - <xs:element name="fwVersion" type="xs:string" /> - <xs:element name="swVersion" type="xs:string" /> - <xs:element name="hwVersion" type="xs:string" /> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes from mgmtResource --> + <xs:extension base="m2m:mgmtResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="deviceLabel" type="xs:string" /> + <xs:element name="manufacturer" type="xs:string" /> + <xs:element name="model" type="xs:string" /> + <xs:element name="deviceType" type="xs:string" /> + <xs:element name="fwVersion" type="xs:string" /> + <xs:element name="swVersion" type="xs:string" /> + <xs:element name="hwVersion" type="xs:string" /> - <!-- Child Resources --> - <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:subscription" /> - </xs:choice> - </xs:choice> - </xs:sequence> - </xs:extension> - </xs:complexContent> - </xs:complexType> + <!-- Child Resources --> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" /> + <xs:element ref="m2m:subscription" maxOccurs="unbounded" /> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + </xs:element> + + <xs:element name="deviceInfoAnnc"> + <xs:complexType> + <xs:complexContent> + <!-- Inherit common attributes from announcedMgmtResource --> + <xs:extension base="m2m:announcedMgmtResource"> + <xs:sequence> + <!-- Resource Specific Attributes --> + <xs:element name="deviceLabel" type="xs:string" minOccurs="0" /> + <xs:element name="manufacturer" type="xs:string" minOccurs="0" /> + <xs:element name="model" type="xs:string" minOccurs="0" /> + <xs:element name="deviceType" type="xs:string" minOccurs="0" /> + <xs:element name="fwVersion" type="xs:string" minOccurs="0" /> + <xs:element name="swVersion" type="xs:string" minOccurs="0" /> + <xs:element name="hwVersion" type="xs:string" minOccurs="0" /> + + <!-- Child Resources --> + <xs:choice minOccurs="0" maxOccurs="1"> + <xs:element name="childResource" type="m2m:childResourceRef" maxOccurs="unbounded" /> + <xs:element ref="m2m:subscription" maxOccurs="unbounded" /> + </xs:choice> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> </xs:element> </xs:schema> -- GitLab