diff --git a/SDT/schema3.0/test/dal-core.xml b/SDT/schema3.0/test/dal-core.xml
index 513013f3ca7a04fc28f236a3afc2041f981f3595..729a4ca2b93b214370141f884b6637cabd3f8cb2 100644
--- a/SDT/schema3.0/test/dal-core.xml
+++ b/SDT/schema3.0/test/dal-core.xml
@@ -19,10 +19,12 @@
</Action>
<Action name="setTarget">
<Doc>Set the associated state to the specified value.</Doc>
- <Arg name="value">
- <Doc>The desired value of the associated state.</Doc>
- <SimpleType type="boolean" />
- </Arg>
+ <Args>
+ <Arg name="value">
+ <Doc>The desired value of the associated state.</Doc>
+ <SimpleType type="boolean" />
+ </Arg>
+ </Args>
</Action>
</Actions>
</ModuleClass>
diff --git a/SDT/schema3.0/test/dal-eg.xml b/SDT/schema3.0/test/dal-eg.xml
index e609e5602fb29c4ac9aa77a754cbc6a29a4544a4..fe3b9a52bb1d3853b4b169b4c3e74da8007573ea 100644
--- a/SDT/schema3.0/test/dal-eg.xml
+++ b/SDT/schema3.0/test/dal-eg.xml
@@ -22,11 +22,18 @@
<tt>on</tt> and <tt>off</tt>. This is clearly a candidate for the
module class <tt>BooleanState</tt>.
</Doc>
- <DeviceInfo>
- <Name>PowerSwitch</Name>
+ <DeviceInfos>
+ <DeviceInfo name="Name">
+ <Doc>Original value: PowerSwitch</Doc>
+ <SimpleType type="string" />
+ </DeviceInfo>
+
<!-- The Vendor field should probably be part of the domain -->
- <Vendor>Telekom Innovation Laboratories</Vendor>
- </DeviceInfo>
+ <DeviceInfo name="Vendor">
+ <Doc>Original value: Telekom Innovation Laboratories</Doc>
+ <SimpleType type="string" />
+ </DeviceInfo>
+ </DeviceInfos>
<Modules>
<Module name="proprietaryPower">
diff --git a/SDT/schema3.0/test/mseeb.xml b/SDT/schema3.0/test/mseeb.xml
index 8253c2377ec9f141a8e3e48ed2c1efc740777836..8402b934de6a0e79cd62429ca49a5b02d6ddc2c2 100644
--- a/SDT/schema3.0/test/mseeb.xml
+++ b/SDT/schema3.0/test/mseeb.xml
@@ -87,12 +87,14 @@
<Doc>
Set the associated state to the specified value.
</Doc>
- <Arg name="value">
- <Doc>
- The desired value of the associated state.
- </Doc>
- <SimpleType type="boolean" />
- </Arg>
+ <Args>
+ <Arg name="value">
+ <Doc>
+ The desired value of the associated state.
+ </Doc>
+ <SimpleType type="boolean" />
+ </Arg>
+ </Args>
</Action>
</Actions>
<Events>
@@ -117,13 +119,28 @@
<Doc>
This device is intended as a demonstration of how to define a Root Device with multiple sub-devices.
</Doc>
- <DeviceInfo>
- <Name>Multi Socket Electrical-Extension-Block</Name>
- <Vendor>HGI</Vendor>
- <FirmwareVersion>1.0</FirmwareVersion>
- <VendorURL>http://www.homegatewayinitative.org</VendorURL>
- <SerialNumber>1234.5</SerialNumber>
- </DeviceInfo>
+ <DeviceInfos>
+ <DeviceInfo name="Name">
+ <Doc>Original value: Multi Socket Electrical-Extension-Block</Doc>
+ <SimpleType type="string" />
+ </DeviceInfo>
+ <DeviceInfo name="Vendor">
+ <Doc>Original value: HGI</Doc>
+ <SimpleType type="string" />
+ </DeviceInfo>
+ <DeviceInfo name="FirmwareVersion">
+ <Doc>Original value: 1.0</Doc>
+ <SimpleType type="string" />
+ </DeviceInfo>
+ <DeviceInfo name="VendorURL">
+ <Doc>Original value: http://www.homegatewayinitative.org</Doc>
+ <SimpleType type="uri" />
+ </DeviceInfo>
+ <DeviceInfo name="SerialNumber">
+ <Doc>Original value: 1234.5</Doc>
+ <SimpleType type="string" />
+ </DeviceInfo>
+ </DeviceInfos>
<!-- These are the modules for the device:
- Switch on/off all contained switches. It inherits from hgi.dal.core.BooleanState.
@@ -188,10 +205,16 @@
<Doc>
This sub device is intended as a demonstration of how to use the abstract modules defined in the <em>HGI Core</em> domain.
</Doc>
- <DeviceInfo>
- <Name>PowerSwitch 1</Name>
- <Vendor>HGI</Vendor>
- </DeviceInfo>
+ <DeviceInfos>
+ <DeviceInfo name="Name">
+ <Doc>Original value: PowerSwitch 1</Doc>
+ <SimpleType type="string" />
+ </DeviceInfo>
+ <DeviceInfo name="Vendor">
+ <Doc>Original value: HGI</Doc>
+ <SimpleType type="string" />
+ </DeviceInfo>
+ </DeviceInfos>
<Modules>
<Module name="power">
<extends domain="hgi.dal.core" class="BooleanState"/>
@@ -205,10 +228,16 @@
<Doc>
This sub device is intended as a demonstration of how to use the abstract modules defined in the <em>HGI Core</em> domain.
</Doc>
- <DeviceInfo>
- <Name>PowerSwitch 2</Name>
- <Vendor>HGI</Vendor>
- </DeviceInfo>
+ <DeviceInfos>
+ <DeviceInfo name="Name">
+ <Doc>Original value: PowerSwitch 2</Doc>
+ <SimpleType type="string" />
+ </DeviceInfo>
+ <DeviceInfo name="Vendor">
+ <Doc>Original value: HGI</Doc>
+ <SimpleType type="string" />
+ </DeviceInfo>
+ </DeviceInfos>
<Modules>
<Module name="power">
<extends domain="hgi.dal.core" class="BooleanState"/>