Commit 0b2682d87165c318e1d8ca30d58a950994a42bad

Authored by ankraft
1 parent 94287b39

- Changed example test files accordingly

... ... @@ -19,10 +19,12 @@
19 19 </Action>
20 20 <Action name="setTarget">
21 21 <Doc>Set the associated state to the specified value.</Doc>
22   - <Arg name="value">
23   - <Doc>The desired value of the associated state.</Doc>
24   - <SimpleType type="boolean" />
25   - </Arg>
  22 + <Args>
  23 + <Arg name="value">
  24 + <Doc>The desired value of the associated state.</Doc>
  25 + <SimpleType type="boolean" />
  26 + </Arg>
  27 + </Args>
26 28 </Action>
27 29 </Actions>
28 30 </ModuleClass>
... ...
... ... @@ -22,11 +22,18 @@
22 22 <tt>on</tt> and <tt>off</tt>. This is clearly a candidate for the
23 23 module class <tt>BooleanState</tt>.
24 24 </Doc>
25   - <DeviceInfo>
26   - <Name>PowerSwitch</Name>
  25 + <DeviceInfos>
  26 + <DeviceInfo name="Name">
  27 + <Doc>Original value: PowerSwitch</Doc>
  28 + <SimpleType type="string" />
  29 + </DeviceInfo>
  30 +
27 31 <!-- The Vendor field should probably be part of the domain -->
28   - <Vendor>Telekom Innovation Laboratories</Vendor>
29   - </DeviceInfo>
  32 + <DeviceInfo name="Vendor">
  33 + <Doc>Original value: Telekom Innovation Laboratories</Doc>
  34 + <SimpleType type="string" />
  35 + </DeviceInfo>
  36 + </DeviceInfos>
30 37  
31 38 <Modules>
32 39 <Module name="proprietaryPower">
... ...
... ... @@ -87,12 +87,14 @@
87 87 <Doc>
88 88 Set the associated state to the specified value.
89 89 </Doc>
90   - <Arg name="value">
91   - <Doc>
92   - The desired value of the associated state.
93   - </Doc>
94   - <SimpleType type="boolean" />
95   - </Arg>
  90 + <Args>
  91 + <Arg name="value">
  92 + <Doc>
  93 + The desired value of the associated state.
  94 + </Doc>
  95 + <SimpleType type="boolean" />
  96 + </Arg>
  97 + </Args>
96 98 </Action>
97 99 </Actions>
98 100 <Events>
... ... @@ -117,13 +119,28 @@
117 119 <Doc>
118 120 This device is intended as a demonstration of how to define a Root Device with multiple sub-devices.
119 121 </Doc>
120   - <DeviceInfo>
121   - <Name>Multi Socket Electrical-Extension-Block</Name>
122   - <Vendor>HGI</Vendor>
123   - <FirmwareVersion>1.0</FirmwareVersion>
124   - <VendorURL>http://www.homegatewayinitative.org</VendorURL>
125   - <SerialNumber>1234.5</SerialNumber>
126   - </DeviceInfo>
  122 + <DeviceInfos>
  123 + <DeviceInfo name="Name">
  124 + <Doc>Original value: Multi Socket Electrical-Extension-Block</Doc>
  125 + <SimpleType type="string" />
  126 + </DeviceInfo>
  127 + <DeviceInfo name="Vendor">
  128 + <Doc>Original value: HGI</Doc>
  129 + <SimpleType type="string" />
  130 + </DeviceInfo>
  131 + <DeviceInfo name="FirmwareVersion">
  132 + <Doc>Original value: 1.0</Doc>
  133 + <SimpleType type="string" />
  134 + </DeviceInfo>
  135 + <DeviceInfo name="VendorURL">
  136 + <Doc>Original value: http://www.homegatewayinitative.org</Doc>
  137 + <SimpleType type="uri" />
  138 + </DeviceInfo>
  139 + <DeviceInfo name="SerialNumber">
  140 + <Doc>Original value: 1234.5</Doc>
  141 + <SimpleType type="string" />
  142 + </DeviceInfo>
  143 + </DeviceInfos>
127 144  
128 145 <!-- These are the modules for the device:
129 146 - Switch on/off all contained switches. It inherits from hgi.dal.core.BooleanState.
... ... @@ -188,10 +205,16 @@
188 205 <Doc>
189 206 This sub device is intended as a demonstration of how to use the abstract modules defined in the <em>HGI Core</em> domain.
190 207 </Doc>
191   - <DeviceInfo>
192   - <Name>PowerSwitch 1</Name>
193   - <Vendor>HGI</Vendor>
194   - </DeviceInfo>
  208 + <DeviceInfos>
  209 + <DeviceInfo name="Name">
  210 + <Doc>Original value: PowerSwitch 1</Doc>
  211 + <SimpleType type="string" />
  212 + </DeviceInfo>
  213 + <DeviceInfo name="Vendor">
  214 + <Doc>Original value: HGI</Doc>
  215 + <SimpleType type="string" />
  216 + </DeviceInfo>
  217 + </DeviceInfos>
195 218 <Modules>
196 219 <Module name="power">
197 220 <extends domain="hgi.dal.core" class="BooleanState"/>
... ... @@ -205,10 +228,16 @@
205 228 <Doc>
206 229 This sub device is intended as a demonstration of how to use the abstract modules defined in the <em>HGI Core</em> domain.
207 230 </Doc>
208   - <DeviceInfo>
209   - <Name>PowerSwitch 2</Name>
210   - <Vendor>HGI</Vendor>
211   - </DeviceInfo>
  231 + <DeviceInfos>
  232 + <DeviceInfo name="Name">
  233 + <Doc>Original value: PowerSwitch 2</Doc>
  234 + <SimpleType type="string" />
  235 + </DeviceInfo>
  236 + <DeviceInfo name="Vendor">
  237 + <Doc>Original value: HGI</Doc>
  238 + <SimpleType type="string" />
  239 + </DeviceInfo>
  240 + </DeviceInfos>
212 241 <Modules>
213 242 <Module name="power">
214 243 <extends domain="hgi.dal.core" class="BooleanState"/>
... ...