From f80296ed63cdaac5e5bc1bb51ac8b15e8294f119 Mon Sep 17 00:00:00 2001
From: ankraft <an.kraft@googlemail.com>
Date: Tue, 22 Jan 2019 18:32:26 +0100
Subject: [PATCH] Renamed Device to DeviceClass. Removed Module element.
Simplified RNG/XSD.
---
SDT/schema4.0/etc/domain.rnc | 42 +++----
SDT/schema4.0/src/domain.rng | 85 ++++++-------
SDT/schema4.0/src/domain.xsd | 58 ++++-----
SDT/schema4.0/test/EchonetLiteExamples.xml | 36 +++---
SDT/schema4.0/test/dal-core.xml | 4 +-
SDT/schema4.0/test/dal-eg.xml | 137 +++++++++------------
SDT/schema4.0/test/deviceClass-test.xml | 21 ++++
SDT/schema4.0/test/example1.SDT.xml | 4 +-
SDT/schema4.0/test/example2.SDT.xml | 32 ++---
SDT/schema4.0/test/example3.SDT.xml | 36 +++---
SDT/schema4.0/test/mseeb.xml | 44 +++----
SDT/schema4.0/test/void-test.xml | 4 +-
12 files changed, 239 insertions(+), 264 deletions(-)
create mode 100644 SDT/schema4.0/test/deviceClass-test.xml
diff --git a/SDT/schema4.0/etc/domain.rnc b/SDT/schema4.0/etc/domain.rnc
index 6eb024f..88a4219 100644
--- a/SDT/schema4.0/etc/domain.rnc
+++ b/SDT/schema4.0/etc/domain.rnc
@@ -14,21 +14,19 @@ Domain =
attribute id { xsd:ID },
DocDef,
element Imports { Domain+ }?,
- element Modules {
- element ModuleClass { ModuleDef }+
- }?,
- element Devices {
- element Device {
+ ModuleClasses?,
+ element DeviceClasses {
+ element DeviceClass {
attribute id { xsd:Name },
DocDef,
PropertiesDef?,
- Modules?,
+ ModuleClasses?,
element SubDevices {
element SubDevice {
attribute id { xsd:Name },
DocDef,
PropertiesDef?,
- Modules?
+ ModuleClasses?
}+
}?
}+
@@ -95,21 +93,21 @@ DocDef =
element caption { text }
})*
}?
-ModuleDef =
- attribute name { text },
- attribute optional { xsd:boolean }?,
- element extends {
- attribute domain { xsd:IDREF },
- attribute class { text }
- }?,
- DocDef,
- PropertiesDef?,
- Actions?,
- Data?,
- Events?
-Modules =
- element Modules {
- element Module { ModuleDef }+
+ModuleClasses =
+ element ModuleClasses {
+ element ModuleClass {
+ attribute name { text },
+ attribute optional { xsd:boolean }?,
+ element extends {
+ attribute domain { xsd:IDREF },
+ attribute class { text }
+ }?,
+ DocDef,
+ PropertiesDef?,
+ Actions?,
+ Data?,
+ Events?
+ }+
}
Actions =
element Actions {
diff --git a/SDT/schema4.0/src/domain.rng b/SDT/schema4.0/src/domain.rng
index 8c037eb..3f5e129 100644
--- a/SDT/schema4.0/src/domain.rng
+++ b/SDT/schema4.0/src/domain.rng
@@ -37,18 +37,12 @@
</element>
</optional>
<optional>
- <element name="Modules">
- <oneOrMore>
- <element name="ModuleClass">
- <ref name="ModuleDef"/>
- </element>
- </oneOrMore>
- </element>
+ <ref name="ModuleClasses"/>
</optional>
<optional>
- <element name="Devices">
+ <element name="DeviceClasses">
<oneOrMore>
- <element name="Device">
+ <element name="DeviceClass">
<attribute name="id">
<data type="Name"/>
</attribute>
@@ -57,7 +51,7 @@
<ref name="PropertiesDef"/>
</optional>
<optional>
- <ref name="Modules"/>
+ <ref name="ModuleClasses"/>
</optional>
<optional>
<element name="SubDevices">
@@ -71,7 +65,7 @@
<ref name="PropertiesDef"/>
</optional>
<optional>
- <ref name="Modules"/>
+ <ref name="ModuleClasses"/>
</optional>
</element>
</oneOrMore>
@@ -244,44 +238,39 @@
</define>
- <define name="ModuleDef">
- <attribute name="name">
- <text/>
- </attribute>
- <optional>
- <attribute name="optional">
- <data type="boolean"/>
- </attribute>
- </optional>
- <optional>
- <element name="extends">
- <attribute name="domain">
- <data type="IDREF"/>
- </attribute>
- <attribute name="class"/>
- </element>
- </optional>
- <ref name="DocDef"/>
- <optional>
- <ref name="PropertiesDef"/>
- </optional>
- <optional>
- <ref name="Actions"/>
- </optional>
- <optional>
- <ref name="Data"/>
- </optional>
- <optional>
- <ref name="Events"/>
- </optional>
- </define>
-
-
- <define name="Modules">
- <element name="Modules">
+ <define name="ModuleClasses">
+ <element name="ModuleClasses">
<oneOrMore>
- <element name="Module">
- <ref name="ModuleDef"/>
+ <element name="ModuleClass">
+ <attribute name="name">
+ <text/>
+ </attribute>
+ <optional>
+ <attribute name="optional">
+ <data type="boolean"/>
+ </attribute>
+ </optional>
+ <optional>
+ <element name="extends">
+ <attribute name="domain">
+ <data type="IDREF"/>
+ </attribute>
+ <attribute name="class"/>
+ </element>
+ </optional>
+ <ref name="DocDef"/>
+ <optional>
+ <ref name="PropertiesDef"/>
+ </optional>
+ <optional>
+ <ref name="Actions"/>
+ </optional>
+ <optional>
+ <ref name="Data"/>
+ </optional>
+ <optional>
+ <ref name="Events"/>
+ </optional>
</element>
</oneOrMore>
</element>
diff --git a/SDT/schema4.0/src/domain.xsd b/SDT/schema4.0/src/domain.xsd
index a600225..02696bf 100644
--- a/SDT/schema4.0/src/domain.xsd
+++ b/SDT/schema4.0/src/domain.xsd
@@ -20,14 +20,8 @@
<xs:sequence>
<xs:group ref="DocDef"/>
<xs:element minOccurs="0" ref="Imports"/>
- <xs:element minOccurs="0" name="Modules">
- <xs:complexType>
- <xs:sequence>
- <xs:element maxOccurs="unbounded" ref="ModuleClass"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
- <xs:element minOccurs="0" ref="Devices"/>
+ <xs:element minOccurs="0" ref="ModuleClasses"/>
+ <xs:element minOccurs="0" ref="DeviceClasses"/>
</xs:sequence>
<xs:attribute ref="xml:base"/>
<xs:attribute name="id" use="required" type="xs:ID"/>
@@ -40,20 +34,19 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="ModuleClass" type="ModuleDef"/>
- <xs:element name="Devices">
+ <xs:element name="DeviceClasses">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" ref="Device"/>
+ <xs:element maxOccurs="unbounded" ref="DeviceClass"/>
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="Device">
+ <xs:element name="DeviceClass">
<xs:complexType>
<xs:sequence>
<xs:group ref="DocDef"/>
<xs:element minOccurs="0" ref="Properties"/>
- <xs:element minOccurs="0" ref="Modules"/>
+ <xs:element minOccurs="0" ref="ModuleClasses"/>
<xs:element minOccurs="0" ref="SubDevices"/>
</xs:sequence>
<xs:attribute name="id" use="required" type="xs:Name"/>
@@ -71,7 +64,7 @@
<xs:sequence>
<xs:group ref="DocDef"/>
<xs:element minOccurs="0" ref="Properties"/>
- <xs:element minOccurs="0" ref="Modules"/>
+ <xs:element minOccurs="0" ref="ModuleClasses"/>
</xs:sequence>
<xs:attribute name="id" use="required" type="xs:Name"/>
</xs:complexType>
@@ -202,32 +195,33 @@
</xs:complexType>
</xs:element>
<xs:element name="caption" type="xs:string"/>
- <xs:complexType name="ModuleDef">
- <xs:sequence>
- <xs:element minOccurs="0" ref="extends"/>
- <xs:group ref="DocDef"/>
- <xs:element minOccurs="0" ref="Properties"/>
- <xs:element minOccurs="0" ref="Actions"/>
- <xs:element minOccurs="0" ref="Data"/>
- <xs:element minOccurs="0" ref="Events"/>
- </xs:sequence>
- <xs:attribute name="name" use="required"/>
- <xs:attribute name="optional" type="xs:boolean"/>
- </xs:complexType>
- <xs:element name="extends">
+ <xs:element name="ModuleClasses">
<xs:complexType>
- <xs:attribute name="domain" use="required" type="xs:IDREF"/>
- <xs:attribute name="class" use="required"/>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" ref="ModuleClass"/>
+ </xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="Modules">
+ <xs:element name="ModuleClass">
<xs:complexType>
<xs:sequence>
- <xs:element maxOccurs="unbounded" ref="Module"/>
+ <xs:element minOccurs="0" ref="extends"/>
+ <xs:group ref="DocDef"/>
+ <xs:element minOccurs="0" ref="Properties"/>
+ <xs:element minOccurs="0" ref="Actions"/>
+ <xs:element minOccurs="0" ref="Data"/>
+ <xs:element minOccurs="0" ref="Events"/>
</xs:sequence>
+ <xs:attribute name="name" use="required"/>
+ <xs:attribute name="optional" type="xs:boolean"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="extends">
+ <xs:complexType>
+ <xs:attribute name="domain" use="required" type="xs:IDREF"/>
+ <xs:attribute name="class" use="required"/>
</xs:complexType>
</xs:element>
- <xs:element name="Module" type="ModuleDef"/>
<xs:element name="Actions">
<xs:complexType>
<xs:sequence>
diff --git a/SDT/schema4.0/test/EchonetLiteExamples.xml b/SDT/schema4.0/test/EchonetLiteExamples.xml
index 429eaf8..54ba1cd 100644
--- a/SDT/schema4.0/test/EchonetLiteExamples.xml
+++ b/SDT/schema4.0/test/EchonetLiteExamples.xml
@@ -9,7 +9,7 @@
<!-- Various examples for module classes -->
- <Modules>
+ <ModuleClasses>
<ModuleClass name="operationStatus">
<Data>
<DataPoint name="operationStatus" readable="true" writable="true">
@@ -62,13 +62,13 @@
</DataPoint>
</Data>
</ModuleClass>
- </Modules>
+ </ModuleClasses>
<!-- Very simple example for a washing machine definition -->
- <Devices>
- <Device id="SimpleWaschingMachine">
+ <DeviceClasses>
+ <DeviceClass id="SimpleWaschingMachine">
<Properties>
<Property name="Name" value="washing machine">
<SimpleType type="string" />
@@ -78,27 +78,27 @@
</Property>
</Properties>
- <Modules>
+ <ModuleClasses>
<!-- Inheriting ModuleClasses from the global generic ModuleClasses -->
- <Module name="installationLocation">
+ <ModuleClass name="installationLocation">
<extends domain="example.based.on.echonetLite" class="installationLocation"/>
- </Module>
+ </ModuleClass>
- <Module name="measuredInstantaneousPowerConsumption">
+ <ModuleClass name="measuredInstantaneousPowerConsumption">
<extends domain="example.based.on.echonetLite" class="measuredInstantaneousPowerConsumption"/>
- </Module>
+ </ModuleClass>
- <Module name="temperatureSensorDataPoints">
+ <ModuleClass name="temperatureSensorDataPoints">
<extends domain="example.based.on.echonetLite" class="temperatureSensorDataPoints"/>
- </Module>
+ </ModuleClass>
<!-- The following Module inherits and extends a global generic ModuleClass with an event. Therefore, it is renamed to express
the change of name. -->
- <Module name="washingMachineOperationStatus">
+ <ModuleClass name="washingMachineOperationStatus">
<extends domain="example.based.on.echonetLite" class="operationStatus"/>
<!-- This Module extends the global one with an event. -->
@@ -109,12 +109,12 @@
</Event>
</Events>
- </Module>
+ </ModuleClass>
<!-- Data points local to the washing machine device -->
- <Module name="washingMachineDataPoints">
+ <ModuleClass name="washingMachineDataPoints">
<Data>
<DataPoint name="door/CoverOpen/CloseStatus" readable="true" writable="false">
<Doc>This property indicates whether the door/cover is open or closed.</Doc>
@@ -170,8 +170,8 @@
</DataPoint>
</Data>
- </Module>
- </Modules>
- </Device>
- </Devices>
+ </ModuleClass>
+ </ModuleClasses>
+ </DeviceClass>
+ </DeviceClasses>
</Domain>
diff --git a/SDT/schema4.0/test/dal-core.xml b/SDT/schema4.0/test/dal-core.xml
index b1eec99..a248410 100644
--- a/SDT/schema4.0/test/dal-core.xml
+++ b/SDT/schema4.0/test/dal-core.xml
@@ -3,7 +3,7 @@
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
id="hgi.dal.core">
- <Modules>
+ <ModuleClasses>
<ModuleClass name="BooleanState">
<Doc>
<tt>BooleanState</tt> is the preferred module for modelling a
@@ -32,6 +32,6 @@
</Action>
</Actions>
</ModuleClass>
- </Modules>
+ </ModuleClasses>
</Domain>
diff --git a/SDT/schema4.0/test/dal-eg.xml b/SDT/schema4.0/test/dal-eg.xml
index f437180..f839729 100644
--- a/SDT/schema4.0/test/dal-eg.xml
+++ b/SDT/schema4.0/test/dal-eg.xml
@@ -1,83 +1,56 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-
-<Domain xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
- id="com.telekom">
-
- <Imports>
- <xi:include href="./dal-core.xml" parse="xml" />
- </Imports>
-
- <Devices>
-
- <Device id="switch.power">
-
- <Doc>
- This device is intended as a demonstration of how to use the
- abstract modules defined in the <em>HGI Core</em> domain. The
- vendor has provided a proprietry module with two operations
- <tt>on</tt> and <tt>off</tt>. This is clearly a candidate for the
- module class <tt>BooleanState</tt>.
- </Doc>
- <Properties>
- <Property name="Name">
- <Doc>Original value: PowerSwitch</Doc>
- <SimpleType type="string" />
- </Property>
-
- <!-- The Vendor field should probably be part of the domain -->
- <Property name="Vendor">
- <Doc>Original value: Telekom Innovation Laboratories</Doc>
- <SimpleType type="string" />
- </Property>
- </Properties>
-
- <Modules>
- <Module name="proprietaryPower">
- <Doc>
- The proprietry interface for turning the switch on and off.
- Actions for setting the state to <tt>on</tt> or <tt>off</tt>
- and for querying the state.
- </Doc>
-
- <Actions>
- <Action name="on">
- <Doc>
- Turn the switch on.
- </Doc>
- </Action>
- <Action name="off">
- <Doc>
- Turn the switch off.
- </Doc>
- </Action>
- <Action name="state">
- <Doc>Query the state of the switch. Returns the string "<tt>on</tt>" or "<tt>off</tt>".</Doc>
- <DataType>
- <SimpleType type="string" />
- </DataType>
- </Action>
- </Actions>
-
- <Events>
- <Event name="switchEvent">
- <Doc>An event that indicates the new state of the switch.
- </Doc>
- <Data>
- <DataPoint name="state" writable="false">
- <DataType>
- <SimpleType type="boolean" />
- </DataType>
- </DataPoint>
- </Data>
- </Event>
- </Events>
- </Module>
-
- <Module name="power">
- <extends domain="hgi.dal.core" class="BooleanState"/>
- </Module>
- </Modules>
- </Device>
- </Devices>
-</Domain>
+<Domain id="com.telekom" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+ <Imports>
+ <xi:include href="./dal-core.xml" parse="xml"/>
+ </Imports>
+ <DeviceClasses>
+ <DeviceClass id="switch.power">
+ <Doc>This device is intended as a demonstration of how to use the abstract modules defined in the <em>HGI Core</em> domain. The vendor has provided a proprietry module with two operations <tt>on</tt> and <tt>off</tt>. This is clearly a candidate for the module class <tt>BooleanState</tt>.</Doc>
+ <Properties>
+ <Property name="Name">
+ <Doc>Original value: PowerSwitch</Doc>
+ <SimpleType type="string"/>
+ </Property>
+ <!-- The Vendor field should probably be part of the domain -->
+ <Property name="Vendor">
+ <Doc>Original value: Telekom Innovation Laboratories</Doc>
+ <SimpleType type="string"/>
+ </Property>
+ </Properties>
+ <ModuleClasses>
+ <ModuleClass name="proprietaryPower">
+ <Doc>The proprietry interface for turning the switch on and off. Actions for setting the state to <tt>on</tt> or <tt>off</tt>and for querying the state.</Doc>
+ <Actions>
+ <Action name="on">
+ <Doc>Turn the switch on.</Doc>
+ </Action>
+ <Action name="off">
+ <Doc>Turn the switch off.</Doc>
+ </Action>
+ <Action name="state">
+ <Doc>Query the state of the switch. Returns the string "<tt>on</tt>" or "<tt>off</tt>".</Doc>
+ <DataType>
+ <SimpleType type="string"/>
+ </DataType>
+ </Action>
+ </Actions>
+ <Events>
+ <Event name="switchEvent">
+ <Doc>An event that indicates the new state of the switch.</Doc>
+ <Data>
+ <DataPoint name="state" writable="false">
+ <DataType>
+ <SimpleType type="boolean"/>
+ </DataType>
+ </DataPoint>
+ </Data>
+ </Event>
+ </Events>
+ </ModuleClass>
+ <ModuleClass name="power">
+ <extends class="BooleanState" domain="hgi.dal.core"/>
+ </ModuleClass>
+ </ModuleClasses>
+ </DeviceClass>
+ </DeviceClasses>
+</Domain>
\ No newline at end of file
diff --git a/SDT/schema4.0/test/deviceClass-test.xml b/SDT/schema4.0/test/deviceClass-test.xml
new file mode 100644
index 0000000..0ce9beb
--- /dev/null
+++ b/SDT/schema4.0/test/deviceClass-test.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" id="deviceClass-test" >
+ <Imports>
+ <xi:include href="./dal-core.xml" parse="xml"/>
+ </Imports>
+ <DeviceClasses>
+ <DeviceClass id="Test">
+ <Doc>This is a test device.</Doc>
+ <Properties>
+ <Property name="aProperty">
+ <SimpleType type="string"></SimpleType>
+ </Property>
+ </Properties>
+ <ModuleClasses>
+ <ModuleClass name="aModuleClass">
+ <extends domain="hgi.dal.core" class="BooleanState"></extends>
+ </ModuleClass>
+ </ModuleClasses>
+ </DeviceClass>
+ </DeviceClasses>
+</Domain>
\ No newline at end of file
diff --git a/SDT/schema4.0/test/example1.SDT.xml b/SDT/schema4.0/test/example1.SDT.xml
index eed2e37..a95cd00 100644
--- a/SDT/schema4.0/test/example1.SDT.xml
+++ b/SDT/schema4.0/test/example1.SDT.xml
@@ -4,7 +4,7 @@
xmlns:xi="http://www.w3.org/2001/XInclude"
id="example1.SDT">
- <Modules>
+ <ModuleClasses>
<!-- Various examples for module classes -->
<ModuleClass name="operationStatus">
@@ -70,6 +70,6 @@
</Data>
</ModuleClass>
- </Modules>
+ </ModuleClasses>
</Domain>
diff --git a/SDT/schema4.0/test/example2.SDT.xml b/SDT/schema4.0/test/example2.SDT.xml
index 2a9361a..1475640 100644
--- a/SDT/schema4.0/test/example2.SDT.xml
+++ b/SDT/schema4.0/test/example2.SDT.xml
@@ -8,25 +8,25 @@
<xi:include href="./example1.SDT.xml" parse="xml" />
</Imports>
- <Devices>
- <Device id="airConditioner">
- <Modules>
- <Module name="operationStatus">
+ <DeviceClasses>
+ <DeviceClass id="airConditioner">
+ <ModuleClasses>
+ <ModuleClass name="operationStatus">
<extends domain="example1.SDT" class="operationStatus"/>
- </Module>
- <Module name="installationLocation">
+ </ModuleClass>
+ <ModuleClass name="installationLocation">
<extends domain="example1.SDT" class="installationLocation"/>
- </Module>
- <Module name="measuredCumulativePowerConsumption">
+ </ModuleClass>
+ <ModuleClass name="measuredCumulativePowerConsumption">
<extends domain="example1.SDT" class="measuredCumulativePowerConsumption"/>
- </Module>
- <Module name="measuredCumulativePowerConsumption">
+ </ModuleClass>
+ <ModuleClass name="measuredCumulativePowerConsumption">
<extends domain="example1.SDT" class="measuredCumulativePowerConsumption"/>
- </Module>
- <Module name="onTimerSetting">
+ </ModuleClass>
+ <ModuleClass name="onTimerSetting">
<extends domain="example1.SDT" class="onTimerSetting"/>
- </Module>
- </Modules>
- </Device>
- </Devices>
+ </ModuleClass>
+ </ModuleClasses>
+ </DeviceClass>
+ </DeviceClasses>
</Domain>
\ No newline at end of file
diff --git a/SDT/schema4.0/test/example3.SDT.xml b/SDT/schema4.0/test/example3.SDT.xml
index 63da249..ef3f1a2 100644
--- a/SDT/schema4.0/test/example3.SDT.xml
+++ b/SDT/schema4.0/test/example3.SDT.xml
@@ -8,28 +8,28 @@
<xi:include href="./example1.SDT.xml" parse="xml" />
</Imports>
- <Devices>
- <Device id="waschingMachine">
- <Modules>
- <Module name="operationStatus">
+ <DeviceClasses>
+ <DeviceClass id="waschingMachine">
+ <ModuleClasses>
+ <ModuleClass name="operationStatus">
<extends domain="example1.SDT" class="operationStatus"/>
- </Module>
- <Module name="installationLocation">
+ </ModuleClass>
+ <ModuleClass name="installationLocation">
<extends domain="example1.SDT" class="installationLocation"/>
- </Module>
- <Module name="measuredCumulativePowerConsumption">
+ </ModuleClass>
+ <ModuleClass name="measuredCumulativePowerConsumption">
<extends domain="example1.SDT" class="measuredCumulativePowerConsumption"/>
- </Module>
- <Module name="measuredCumulativePowerConsumption">
+ </ModuleClass>
+ <ModuleClass name="measuredCumulativePowerConsumption">
<extends domain="example1.SDT" class="measuredCumulativePowerConsumption"/>
- </Module>
- <Module name="onTimerSetting">
+ </ModuleClass>
+ <ModuleClass name="onTimerSetting">
<extends domain="example1.SDT" class="onTimerSetting"/>
- </Module>
- <Module name="statusDoor">
+ </ModuleClass>
+ <ModuleClass name="statusDoor">
<extends domain="example1.SDT" class="statusDoor"/>
- </Module>
- </Modules>
- </Device>
- </Devices>
+ </ModuleClass>
+ </ModuleClasses>
+ </DeviceClass>
+ </DeviceClasses>
</Domain>
\ No newline at end of file
diff --git a/SDT/schema4.0/test/mseeb.xml b/SDT/schema4.0/test/mseeb.xml
index 4f5622f..cd233dd 100644
--- a/SDT/schema4.0/test/mseeb.xml
+++ b/SDT/schema4.0/test/mseeb.xml
@@ -71,7 +71,7 @@
<xi:include href="./dal-core.xml" parse="xml" />
</Imports>
- <Modules>
+ <ModuleClasses>
<ModuleClass name="BooleanState">
<Doc>
<tt>BooleanState</tt> is the preferred module for modelling a functionality corresponding to an underlying binary state.This module should be used to abstract away from the actual datatype and values in question. Note that the module does not define whether the execution mode is blocking or non-blocking.
@@ -113,15 +113,15 @@
</Event>
</Events>
</ModuleClass>
- </Modules>
+ </ModuleClasses>
<!-- Definition of the Device starts here. -->
- <Devices>
+ <DeviceClasses>
<!-- The Device contains several sub-devices and offers one action on its own. -->
- <Device id="MSEEB.root">
+ <DeviceClass id="MSEEB.root">
<Doc>
This device is intended as a demonstration of how to define a Root Device with multiple sub-devices.
</Doc>
@@ -153,8 +153,8 @@
- A module with some data points for the firmware version of the whole device and a list of names of the containted power switches.
-->
- <Modules>
- <Module name="rootPowerOnOff" optional="true">
+ <ModuleClasses>
+ <ModuleClass name="rootPowerOnOff" optional="true">
<extends domain="hgi.dal.core" class="BooleanState"/>
<Doc>
The proprietry interface for turning all switches of the extension block on and off.
@@ -166,8 +166,8 @@
<SimpleType type="string" />
</Property>
</Properties>
- </Module>
- <Module name="power">
+ </ModuleClass>
+ <ModuleClass name="power">
<Actions>
<Action name="getPowerConsumption">
<Doc>Get the power consumption.</Doc>
@@ -200,9 +200,9 @@
</DataType>
</Action>
</Actions>
- </Module>
+ </ModuleClass>
- <Module name="extensionBlockDataPoints">
+ <ModuleClass name="extensionBlockDataPoints">
<Actions>
<Action name="getNames">
<DataType name="names">
@@ -241,8 +241,8 @@
</DataType>
</DataPoint>
</Data>
- </Module>
- </Modules>
+ </ModuleClass>
+ </ModuleClasses>
<!-- Definition of sub-devices starts here. -->
@@ -263,11 +263,11 @@
<SimpleType type="string" />
</Property>
</Properties>
- <Modules>
- <Module name="power">
+ <ModuleClasses>
+ <ModuleClass name="power">
<extends domain="hgi.dal.core" class="BooleanState"/>
- </Module>
- </Modules>
+ </ModuleClass>
+ </ModuleClasses>
</SubDevice>
<!-- This is the second power switch of the extension block. -->
@@ -290,15 +290,15 @@
<SimpleType type="integer" />
</Property>
</Properties>
- <Modules>
- <Module name="power">
+ <ModuleClasses>
+ <ModuleClass name="power">
<extends domain="hgi.dal.core" class="BooleanState"/>
- </Module>
- </Modules>
+ </ModuleClass>
+ </ModuleClasses>
</SubDevice>
</SubDevices>
- </Device>
- </Devices>
+ </DeviceClass>
+ </DeviceClasses>
</Domain>
diff --git a/SDT/schema4.0/test/void-test.xml b/SDT/schema4.0/test/void-test.xml
index 5c61374..fc550af 100644
--- a/SDT/schema4.0/test/void-test.xml
+++ b/SDT/schema4.0/test/void-test.xml
@@ -2,7 +2,7 @@
<!-- Test the void BasicType -->
<Domain id="void-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
- <Modules>
+ <ModuleClasses>
<ModuleClass name="TestVoid">
<Actions>
<Action name="TestVoidAction">
@@ -19,5 +19,5 @@
</DataPoint>
</Data>
</ModuleClass>
- </Modules>
+ </ModuleClasses>
</Domain>
\ No newline at end of file
--
GitLab