From f4920fe6de739719edf1e6e094db748fabcbe55a Mon Sep 17 00:00:00 2001
From: ankraft <an.kraft@googlemail.com>
Date: Mon, 6 May 2019 17:00:42 +0200
Subject: [PATCH] Removed product from Extend element.

---
 SDT/schema4.0/etc/domain.rnc | 6 ++++--
 SDT/schema4.0/src/domain.rng | 3 +--
 SDT/schema4.0/src/domain.xsd | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/SDT/schema4.0/etc/domain.rnc b/SDT/schema4.0/etc/domain.rnc
index 948cf75..ca1ff61 100644
--- a/SDT/schema4.0/etc/domain.rnc
+++ b/SDT/schema4.0/etc/domain.rnc
@@ -137,7 +137,10 @@ ProductsDef =
       PropertiesDef?,
       ModuleClassesDef?,
       SubDevicesRef?,
-      element DeviceClass { ExtendDef },
+      element DeviceClass {
+        # TODO: Make optional?
+        ExtendDef
+      },
       ExtendDef?
     }+
   }
@@ -205,7 +208,6 @@ ExtendType =
   | "datapoint"
   | "event"
   | "moduleclass"
-  | "product"
   | "property"
   | "device"
   | "subdevice"
diff --git a/SDT/schema4.0/src/domain.rng b/SDT/schema4.0/src/domain.rng
index e8b3a98..b614d10 100644
--- a/SDT/schema4.0/src/domain.rng
+++ b/SDT/schema4.0/src/domain.rng
@@ -388,7 +388,7 @@
 					<optional>
 						<ref name="SubDevicesRef" />
 					</optional>
-					<element name="DeviceClass">
+					<element name="DeviceClass">  <!-- TODO: Make optional? -->
 						<ref name="ExtendDef" />
 					</element>
 					<optional>
@@ -570,7 +570,6 @@
 			<value>datapoint</value>
 			<value>event</value>
 			<value>moduleclass</value>
-			<value>product</value>
 			<value>property</value>
 			<value>device</value>
 			<value>subdevice</value>
diff --git a/SDT/schema4.0/src/domain.xsd b/SDT/schema4.0/src/domain.xsd
index f0c20b3..b2e8576 100644
--- a/SDT/schema4.0/src/domain.xsd
+++ b/SDT/schema4.0/src/domain.xsd
@@ -423,7 +423,6 @@
       <xs:enumeration value="datapoint"/>
       <xs:enumeration value="event"/>
       <xs:enumeration value="moduleclass"/>
-      <xs:enumeration value="product"/>
       <xs:enumeration value="property"/>
       <xs:enumeration value="device"/>
       <xs:enumeration value="subdevice"/>
-- 
2.18.1