Added SubDevices in Domain, and Extend for SubDevices.

SDT/schema4.0/etc/domain.rnc

@@ -17,6 +17,7 @@ Domain =
     element Imports { Domain+ }?,
     element DataTypes { DataTypeDef+ }?,
     ModuleClassesDef?,
+    SubDevicesRef?,
     DeviceClassesDef?,
     ProductClassesDef?
   }
@@ -112,6 +113,7 @@ SubDevicesRef =
       attribute minOccurs { text }?,
       attribute maxOccurs { text }?,
       DocDef,
+      ExtendDef?,
       PropertiesDef?,
       ModuleClassesDef?
     }+

SDT/schema4.0/src/domain.rng

@@ -51,6 +51,9 @@
 			<optional>
 				<ref name="ModuleClassesDef"/>
 			</optional>
+			<optional>
+				<ref name="SubDevicesRef" />
+			</optional>
 			<optional>
 				<ref name="DeviceClassesDef" />
 			</optional>
@@ -325,6 +328,9 @@
 						</attribute>
 					</optional>
 					<ref name="DocDef"/>
+					<optional>
+						<ref name="ExtendDef" />
+					</optional>
 					<optional>
 						<ref name="PropertiesDef"/>
 					</optional>

SDT/schema4.0/src/domain.xsd

@@ -23,6 +23,7 @@
             <xs:element minOccurs="0" ref="Imports"/>
             <xs:element minOccurs="0" ref="DataTypes"/>
             <xs:element minOccurs="0" ref="ModuleClasses"/>
+            <xs:element minOccurs="0" ref="SubDevices"/>
             <xs:element minOccurs="0" ref="DeviceClasses"/>
             <xs:element minOccurs="0" ref="ProductClasses"/>
           </xs:sequence>
@@ -242,6 +243,7 @@
       <xs:complexContent>
         <xs:extension base="DocDef">
           <xs:sequence>
+            <xs:element minOccurs="0" ref="Extend"/>
             <xs:element minOccurs="0" ref="Properties"/>
             <xs:element minOccurs="0" ref="ModuleClasses"/>
           </xs:sequence>

SDT/schema4.0/test/subdevices-test.xml

+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Test the data types references -->
+
+<Domain id="subdevices-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+	<SubDevices>
+		<SubDevice id="aSubDevice">
+			<ModuleClasses>
+				<ModuleClass name="aModuleClass">
+					<Data>
+						<DataPoint name="aDataPoint">
+							<DataType>
+								<SimpleType type="boolean" />
+							</DataType>
+						</DataPoint>
+					</Data>
+				</ModuleClass>
+			</ModuleClasses>
+		</SubDevice>
+	</SubDevices>
+
+	<DeviceClasses>
+		<DeviceClass id="aDeviceClass">
+			<SubDevices>
+				<SubDevice id="subDevice">
+					<Extend domain="subdevices-test" entity="aSubDevice" />
+				</SubDevice>
+			</SubDevices>
+		</DeviceClass>
+	</DeviceClasses>
+</Domain>
\ No newline at end of file