Commit 8103002b authored by ankraft's avatar ankraft

Changed namespace to http://www.onem2m.org/xml/sdt/4.0

parent f4920fe6
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<schemavalidate warn="true"> <schemavalidate warn="true">
<fileset dir="${basedir}/test" includes="*.xml"/> <fileset dir="${basedir}/test" includes="*.xml"/>
<attribute name="http://apache.org/xml/features/xinclude" value="true"/> <attribute name="http://apache.org/xml/features/xinclude" value="true"/>
<schema namespace="http://homegatewayinitiative.org/xml/dal/4.0" <schema namespace="http://www.onem2m.org/xml/sdt/4.0"
file="${path.src}/domain.xsd" /> file="${path.src}/domain.xsd" />
<schema namespace="http://www.w3.org/2001/XInclude" <schema namespace="http://www.w3.org/2001/XInclude"
file="${basedir}/etc/XInclude.xsd" /> file="${basedir}/etc/XInclude.xsd" />
......
namespace local = "" namespace local = ""
default namespace xsl = "http://homegatewayinitiative.org/xml/dal/4.0" default namespace xsl = "http://www.onem2m.org/xml/sdt/4.0"
namespace xi = "http://www.w3.org/2001/XInclude" namespace xi = "http://www.w3.org/2001/XInclude"
version = "1.0" version = "1.0"
......
targetNamespace="http://homegatewayinitiative.org/xml/dal/4.0" targetNamespace="http://www.onem2m.org/xml/sdt/4.0"
xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema"
<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0"> <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
<namespace ns="http://homegatewayinitiative.org/xml/dal/4.0" typeId="DAL"/> <namespace ns="http://www.onem2m.org/xml/sdt/4.0" typeId="DAL"/>
<namespace ns="http://www.w3.org/2001/XInclude" typeId="XINC"/> <namespace ns="http://www.w3.org/2001/XInclude" typeId="XINC"/>
<typeId id="DAL" uri="dal.rnc"/> <typeId id="DAL" uri="dal.rnc"/>
......
...@@ -112,18 +112,21 @@ ...@@ -112,18 +112,21 @@
This property indicates whether the door/cover is open or closed. This property indicates whether the door/cover is open or closed.
Washing machine setting Washing machine setting
This property indicates the current stage of the washing cycle. This property indicates the current stage of the washing cycle.
...@@ -139,6 +142,7 @@ ...@@ -139,6 +142,7 @@
Reservation ON/OFF Reservation ON/OFF
......
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
BooleanState 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.
Obtain the current associated state.
BooleanState 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.
Obtain the current associated state.
Set the associated state to the specified value.
The desired value of the associated state.
Set the associated state to the specified value.
The desired value of the associated state.
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
PowerSwitch
Telekom Innovation Laboratories
This device is intended as a demonstration of how to use the
abstract modules defined in the HGI Core domain. The
vendor has provided a proprietry module with two operations
on and off. This is clearly a candidate for the
module class BooleanState.
The proprietry interface for turning the switch on and off.
Actions for setting the state to on or off
and for querying the state.
Turn the switch on.
Turn the switch off.
Query the state of the switch. Returns the string "on"
or "off".
An event that indicates the new state of the switch.
This device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain. The vendor has provided a proprietry module with two operations on and off. This is clearly a candidate for the module class BooleanState.
Original value: PowerSwitch
Original value: Telekom Innovation Laboratories
The proprietry interface for turning the switch on and off. Actions for setting the state to on or offand for querying the state.
Turn the switch on.
Turn the switch off.
Query the state of the switch. Returns the string "on" or "off".
An event that indicates the new state of the switch.
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
Obtain the current associated state. Obtain the current associated state.
...@@ -23,7 +26,12 @@ ...@@ -23,7 +26,12 @@
The desired value of the associated state.
The desired value of the associated state.
...@@ -32,6 +40,9 @@ ...@@ -32,6 +40,9 @@
...@@ -47,14 +58,29 @@ ...@@ -47,14 +58,29 @@
Multi Socket Electrical-Extension-Block This device is intended as a demonstration of how to define a Root Device with multiple sub-devices.
HGI
1.0
http://www.homegatewayinitative.org
1234.5
This device is intended as a demonstration of how to define a Root Device with multiple sub-devices.
Original value: Multi Socket Electrical-Extension-Block
Original value: HGI
Original value: 1.0
Original value: http://www.homegatewayinitative.org
Original value: 1234.5
...@@ -62,23 +88,84 @@ ...@@ -62,23 +88,84 @@
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".
Version for this ModuleClass
Get the power consumption.
This is an example simple data type with a minimum-value constraint.
The value must be equal or greater 0.0
Steps are 0.1
This datapoint represents the firmware version of the extension block. This datapoint represents the firmware version of the extension block.
This datapoint is an array of strings with the names of the contained devices. This datapoint is an array of strings with the names of the contained devices.
...@@ -93,11 +180,15 @@ ...@@ -93,11 +180,15 @@
PowerSwitch 1 This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
HGI
This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
...@@ -110,11 +201,21 @@ ...@@ -110,11 +201,21 @@
PowerSwitch 2 This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
HGI
This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
......
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
- See the license text at [https://opensource.org/licenses/BSD-3-Clause for - See the license text at [https://opensource.org/licenses/BSD-3-Clause for
- full details. - full details.
--> -->
<xs:schema targetNamespace="http://homegatewayinitiative.org/xml/dal/4.0" <xs:schema targetNamespace="http://www.onem2m.org/xml/sdt/4.0"
xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"> elementFormDefault="qualified">
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
document ... --> document ... -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:dal="http://homegatewayinitiative.org/xml/dal/2.0" xmlns:dal="http://www.onem2m.org/xml/sdt/4.0"
xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml"
xmlns:redirect="http://xml.apache.org/xalan/redirect" xmlns:redirect="http://xml.apache.org/xalan/redirect"
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<!-- Example SDT definition taken from EchonetLite https://github.com/ECHONET-Consortium --> <!-- Example SDT definition taken from EchonetLite https://github.com/ECHONET-Consortium -->
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0" <Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
id="example.based.on.echonetLite"> id="example.based.on.echonetLite">
......
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the data types references --> <!-- Test the data types references -->
<Domain id="action-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude"> <Domain id="action-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses> <ModuleClasses>
<ModuleClass name="TestActions"> <ModuleClass name="TestActions">
......
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the data types references --> <!-- Test the data types references -->
<Domain id="arg-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude"> <Domain id="arg-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses> <ModuleClasses>
<ModuleClass name="TestArg"> <ModuleClass name="TestArg">
......
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0" <Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
id="hgi.dal.core"> id="dal.core">
<ModuleClasses> <ModuleClasses>
<ModuleClass name="BooleanState"> <ModuleClass name="BooleanState">
......
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<Domain id="com.telekom" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude"> <Domain id="com.telekom" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<Imports> <Imports>
<xi:include href="./dal-core.xml" parse="xml"/> <xi:include href="./dal-core.xml" parse="xml"/>
</Imports> </Imports>
......
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the EnumType --> <!-- Test the EnumType -->
<Domain id="datapoint-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude"> <Domain id="datapoint-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses> <ModuleClasses>
<ModuleClass name="TestDataPoint"> <ModuleClass name="TestDataPoint">
<Data> <Data>
......
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the data types references --> <!-- Test the data types references -->
<Domain id="datatypes-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude"> <Domain id="datatypes-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<DataTypes> <DataTypes>
<DataType name="temperatureType" unitOfMeasure="C"> <DataType name="temperatureType" unitOfMeasure="C">
<SimpleType type="float"/> <SimpleType type="float"/>
......
<?xml version="1.0" encoding="iso-8859-1"?> <?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" > <Domain xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" id="deviceClass.test" >
<Imports> <Imports>
<xi:include href="./dal-core.xml" parse="xml"/> <xi:include href="./dal-core.xml" parse="xml"/>
</Imports> </Imports>
......
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the EnumType --> <!-- Test the EnumType -->
<Domain id="enumtype-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude"> <Domain id="enumtype-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses> <ModuleClasses>
<ModuleClass name="TestEnumType"> <ModuleClass name="TestEnumType">
<Data> <Data>
......
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<!-- Example1 SDT inspired by some Echonet Lite examples --> <!-- Example1 SDT inspired by some Echonet Lite examples -->
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0" <Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
id="example1.SDT"> id="example1.SDT">
......
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<!-- Example1 SDT inspired by some Echonet Lite examples --> <!-- Example1 SDT inspired by some Echonet Lite examples -->
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0" <Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
id="example2.SDT"> id="example2.SDT">
......
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<!-- Example1 SDT inspired by some Echonet Lite examples --> <!-- Example1 SDT inspired by some Echonet Lite examples -->
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0" <Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xi="http://www.w3.org/2001/XInclude"
id="example3.SDT"> id="example3.SDT">
......
<?xml version="1.0" encoding="iso-8859-1"?> <?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the extends element --> <!-- Test the extends element -->
<Domain id="extend-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude"> <Domain id="extend-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses> <ModuleClasses>
<ModuleClass name="TestExtendsParent"> <ModuleClass name="TestExtendsParent">
<Data> <Data>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<!-- <!--
+................................................+ +................................................+
:Domain:org.homegatewayinitiative : :Domain:org.onem2m :
: : : :
: +..........................................+ : : +..........................................+ :
: :Module:BooleanState : : : :Module:BooleanState : :
...@@ -62,8 +62,8 @@ ...@@ -62,8 +62,8 @@
--> -->
<Domain xmlns:xi="http://www.w3.org/2001/XInclude" <Domain xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns="http://www.onem2m.org/xml/sdt/4.0"
id="org.homegatewayinitiative"> id="org.onem2m">
<!-- The following import statements include ModuleClasses from HGI --> <!-- The following import statements include ModuleClasses from HGI -->
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<SimpleType type="string" /> <SimpleType type="string" />
</Property> </Property>
<Property name="VendorURL"> <Property name="VendorURL">
<Doc>Original value: http://www.homegatewayinitative.org</Doc> <Doc>Original value: http://www.onem2m.org</Doc>