Skip to content

GitLab

Commit 840ff1bd authored by ankraft's avatar ankraft
Browse files

Renamed Characteristic(s) to Properties/Property.

parent bcbcaab4
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 56 deletions
SDT/schema3.0/etc/domain.rnc
View file @ 840ff1bd
...@@ -12,22 +12,22 @@ Domain = ...@@ -12,22 +12,22 @@ Domain =
element Device { element Device {
attribute id { xsd:Name }, attribute id { xsd:Name },
DocDef, DocDef,
CharacteristicsDef?, PropertiesDef?,
Modules?, Modules?,
element SubDevices { element SubDevices {
element SubDevice { element SubDevice {
attribute id { xsd:Name }, attribute id { xsd:Name },
DocDef, DocDef,
CharacteristicsDef?, PropertiesDef?,
Modules? Modules?
}+ }+
}? }?
}+ }+
}? }?
} }
CharacteristicsDef = PropertiesDef =
element Characteristics { element Properties {
element Characteristic { element Property {
attribute name { text }, attribute name { text },
attribute optional { xsd:boolean }?, attribute optional { xsd:boolean }?,
attribute value { text }?, attribute value { text }?,
...@@ -94,7 +94,7 @@ ModuleDef = ...@@ -94,7 +94,7 @@ ModuleDef =
attribute class { text } attribute class { text }
}?, }?,
DocDef, DocDef,
CharacteristicsDef?, PropertiesDef?,
Actions?, Actions?,
Data?, Data?,
Events? Events?
......
SDT/schema3.0/src/domain.rng
View file @ 840ff1bd
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</attribute> </attribute>
<ref name="DocDef"/> <ref name="DocDef"/>
<optional> <optional>
<ref name="CharacteristicsDef"/> <ref name="PropertiesDef"/>
</optional> </optional>
<optional> <optional>
<ref name="Modules"/> <ref name="Modules"/>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</attribute> </attribute>
<ref name="DocDef"/> <ref name="DocDef"/>
<optional> <optional>
<ref name="CharacteristicsDef"/> <ref name="PropertiesDef"/>
</optional> </optional>
<optional> <optional>
<ref name="Modules"/> <ref name="Modules"/>
...@@ -74,10 +74,10 @@ ...@@ -74,10 +74,10 @@
</define> </define>
<define name="CharacteristicsDef"> <define name="PropertiesDef">
<element name="Characteristics"> <element name="Properties">
<oneOrMore> <oneOrMore>
<element name="Characteristic"> <element name="Property">
<attribute name="name"> <attribute name="name">
<text/> <text/>
</attribute> </attribute>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</optional> </optional>
<ref name="DocDef"/> <ref name="DocDef"/>
<optional> <optional>
<ref name="CharacteristicsDef"/> <ref name="PropertiesDef"/>
</optional> </optional>
<optional> <optional>
<ref name="Actions"/> <ref name="Actions"/>
......
SDT/schema3.0/src/domain.xsd
View file @ 840ff1bd
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:group ref="DocDef"/> <xs:group ref="DocDef"/>
<xs:element minOccurs="0" ref="Characteristics"/> <xs:element minOccurs="0" ref="Properties"/>
<xs:element minOccurs="0" ref="Modules"/> <xs:element minOccurs="0" ref="Modules"/>
<xs:element minOccurs="0" ref="SubDevices"/> <xs:element minOccurs="0" ref="SubDevices"/>
</xs:sequence> </xs:sequence>
...@@ -60,20 +60,20 @@ ...@@ -60,20 +60,20 @@
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:group ref="DocDef"/> <xs:group ref="DocDef"/>
<xs:element minOccurs="0" ref="Characteristics"/> <xs:element minOccurs="0" ref="Properties"/>
<xs:element minOccurs="0" ref="Modules"/> <xs:element minOccurs="0" ref="Modules"/>
</xs:sequence> </xs:sequence>
<xs:attribute name="id" use="required" type="xs:Name"/> <xs:attribute name="id" use="required" type="xs:Name"/>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="Characteristics"> <xs:element name="Properties">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element maxOccurs="unbounded" ref="Characteristic"/> <xs:element maxOccurs="unbounded" ref="Property"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="Characteristic"> <xs:element name="Property">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:group ref="DocDef"/> <xs:group ref="DocDef"/>
...@@ -196,7 +196,7 @@ ...@@ -196,7 +196,7 @@
<xs:sequence> <xs:sequence>
<xs:element minOccurs="0" ref="extends"/> <xs:element minOccurs="0" ref="extends"/>
<xs:group ref="DocDef"/> <xs:group ref="DocDef"/>
<xs:element minOccurs="0" ref="Characteristics"/> <xs:element minOccurs="0" ref="Properties"/>
<xs:element minOccurs="0" ref="Actions"/> <xs:element minOccurs="0" ref="Actions"/>
<xs:element minOccurs="0" ref="Data"/> <xs:element minOccurs="0" ref="Data"/>
<xs:element minOccurs="0" ref="Events"/> <xs:element minOccurs="0" ref="Events"/>
......
SDT/schema3.0/test/dal-eg.xml
View file @ 840ff1bd
...@@ -19,18 +19,18 @@ ...@@ -19,18 +19,18 @@
<tt>on</tt> and <tt>off</tt>. This is clearly a candidate for the <tt>on</tt> and <tt>off</tt>. This is clearly a candidate for the
module class <tt>BooleanState</tt>. module class <tt>BooleanState</tt>.
</Doc> </Doc>
<Characteristics> <Properties>
<Characteristic name="Name"> <Property name="Name">
<Doc>Original value: PowerSwitch</Doc> <Doc>Original value: PowerSwitch</Doc>
<SimpleType type="string" /> <SimpleType type="string" />
</Characteristic> </Property>
<!-- The Vendor field should probably be part of the domain --> <!-- The Vendor field should probably be part of the domain -->
<Characteristic name="Vendor"> <Property name="Vendor">
<Doc>Original value: Telekom Innovation Laboratories</Doc> <Doc>Original value: Telekom Innovation Laboratories</Doc>
<SimpleType type="string" /> <SimpleType type="string" />
</Characteristic> </Property>
</Characteristics> </Properties>
<Modules> <Modules>
<Module name="proprietaryPower"> <Module name="proprietaryPower">
......
SDT/schema3.0/test/mseeb.xml
View file @ 840ff1bd
...@@ -125,28 +125,28 @@ ...@@ -125,28 +125,28 @@
<Doc> <Doc>
This device is intended as a demonstration of how to define a Root Device with multiple sub-devices. This device is intended as a demonstration of how to define a Root Device with multiple sub-devices.
</Doc> </Doc>
<Characteristics> <Properties>
<Characteristic name="Name"> <Property name="Name">
<Doc>Original value: Multi Socket Electrical-Extension-Block</Doc> <Doc>Original value: Multi Socket Electrical-Extension-Block</Doc>
<SimpleType type="string" /> <SimpleType type="string" />
</Characteristic> </Property>
<Characteristic name="Vendor"> <Property name="Vendor">
<Doc>Original value: HGI</Doc> <Doc>Original value: HGI</Doc>
<SimpleType type="string" /> <SimpleType type="string" />
</Characteristic> </Property>
<Characteristic name="FirmwareVersion"> <Property name="FirmwareVersion">
<Doc>Original value: 1.0</Doc> <Doc>Original value: 1.0</Doc>
<SimpleType type="string" /> <SimpleType type="string" />
</Characteristic> </Property>
<Characteristic name="VendorURL"> <Property name="VendorURL">
<Doc>Original value: http://www.homegatewayinitative.org</Doc> <Doc>Original value: http://www.homegatewayinitative.org</Doc>
<SimpleType type="uri" /> <SimpleType type="uri" />
</Characteristic> </Property>
<Characteristic name="SerialNumber"> <Property name="SerialNumber">
<Doc>Original value: 1234.5</Doc> <Doc>Original value: 1234.5</Doc>
<SimpleType type="string" /> <SimpleType type="string" />
</Characteristic> </Property>
</Characteristics> </Properties>
<!-- These are the modules for the device: <!-- These are the modules for the device:
- Switch on/off all contained switches. It inherits from hgi.dal.core.BooleanState. - Switch on/off all contained switches. It inherits from hgi.dal.core.BooleanState.
...@@ -160,12 +160,12 @@ ...@@ -160,12 +160,12 @@
The proprietry interface for turning all switches of the extension block on and off. The proprietry interface for turning all switches of the extension block on and off.
The action "BooleanState:get" returns "true" when any of the sub-devices is in the state "on", otherwise it returns "false". The action "BooleanState:get" returns "true" when any of the sub-devices is in the state "on", otherwise it returns "false".
</Doc> </Doc>
<Characteristics> <Properties>
<Characteristic name="version" value="1.0.0"> <Property name="version" value="1.0.0">
<Doc>Version for this ModuleClass</Doc> <Doc>Version for this ModuleClass</Doc>
<SimpleType type="string" /> <SimpleType type="string" />
</Characteristic> </Property>
</Characteristics> </Properties>
</Module> </Module>
<Module name="power"> <Module name="power">
<Actions> <Actions>
...@@ -252,14 +252,14 @@ ...@@ -252,14 +252,14 @@
<Doc> <Doc>
This sub device is intended as a demonstration of how to use the abstract modules defined in the <em>HGI Core</em> domain. This sub device is intended as a demonstration of how to use the abstract modules defined in the <em>HGI Core</em> domain.
</Doc> </Doc>
<Characteristics> <Properties>
<Characteristic name="Name" value="PowerSwitch 1"> <Property name="Name" value="PowerSwitch 1">
<SimpleType type="string" /> <SimpleType type="string" />
</Characteristic> </Property>
<Characteristic name="Vendor" value="HGI"> <Property name="Vendor" value="HGI">
<SimpleType type="string" /> <SimpleType type="string" />
</Characteristic> </Property>
</Characteristics> </Properties>
<Modules> <Modules>
<Module name="power"> <Module name="power">
<extends domain="hgi.dal.core" class="BooleanState"/> <extends domain="hgi.dal.core" class="BooleanState"/>
...@@ -273,20 +273,20 @@ ...@@ -273,20 +273,20 @@
<Doc> <Doc>
This sub device is intended as a demonstration of how to use the abstract modules defined in the <em>HGI Core</em> domain. This sub device is intended as a demonstration of how to use the abstract modules defined in the <em>HGI Core</em> domain.
</Doc> </Doc>
<Characteristics> <Properties>
<Characteristic name="Name" value="PowerSwitch 2"> <Property name="Name" value="PowerSwitch 2">
<SimpleType type="string" /> <SimpleType type="string" />
</Characteristic> </Property>
<Characteristic name="Vendor" value="HGI"> <Property name="Vendor" value="HGI">
<SimpleType type="string" /> <SimpleType type="string" />
</Characteristic> </Property>
<Characteristic name="VendorURL" value="http://homegatwaysinitiative.org"> <Property name="VendorURL" value="http://homegatwaysinitiative.org">
<SimpleType type="uri" /> <SimpleType type="uri" />
</Characteristic> </Property>
<Characteristic name="maximumAltitude" value="2800"> <Property name="maximumAltitude" value="2800">
<SimpleType type="integer" /> <SimpleType type="integer" />
</Characteristic> </Property>
</Characteristics> </Properties>
<Modules> <Modules>
<Module name="power"> <Module name="power">
<extends domain="hgi.dal.core" class="BooleanState"/> <extends domain="hgi.dal.core" class="BooleanState"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment