Added support for DataTypes under Domain. Added test case.

SDT/schema4.0/etc/domain.rnc

@@ -14,6 +14,7 @@ Domain =
     attribute id { xsd:ID },
     DocDef,
     element Imports { Domain+ }?,
+    element DataTypes { DataTypeDef+ }?,
     ModuleClasses?,
     element DeviceClasses {
       element DeviceClass {

SDT/schema4.0/src/domain.rng

@@ -36,6 +36,13 @@
 					</oneOrMore>
 				</element>
 			</optional>
+			<optional>
+				<element name="DataTypes">
+					<oneOrMore>
+						<ref name="DataTypeDef"/>
+					</oneOrMore>
+				</element>
+			</optional>
 			<optional>
 				<ref name="ModuleClasses"/>
 			</optional>

SDT/schema4.0/src/domain.xsd

@@ -20,6 +20,7 @@
       <xs:sequence>
         <xs:group ref="DocDef"/>
         <xs:element minOccurs="0" ref="Imports"/>
+        <xs:element minOccurs="0" ref="DataTypes"/>
         <xs:element minOccurs="0" ref="ModuleClasses"/>
         <xs:element minOccurs="0" ref="DeviceClasses"/>
       </xs:sequence>
@@ -34,6 +35,13 @@
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="DataTypes">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="DataType"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="DeviceClasses">
     <xs:complexType>
       <xs:sequence>

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

+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Test the data types references -->
+
+<Domain id="datatypes-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+	<DataTypes>
+		<DataType name="temperatureType" unitOfMeasure="C">
+			<SimpleType type="float"/>
+		</DataType>
+		<DataType name="anEnumType">
+			<EnumType>
+				<EnumValue name="red" type="integer" value="1"/>
+				<EnumValue name="green" value="2"/>
+				<EnumValue name="blue" value="3"/>
+			</EnumType>
+		</DataType>
+	</DataTypes>
+</Domain>
\ No newline at end of file

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

 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Test the void BasicType -->
+<!-- Test the EnumType -->
 
 <Domain id="enumtype-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<ModuleClasses>