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 @@
<schemavalidate warn="true">
<fileset dir="${basedir}/test" includes="*.xml"/>
<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" />
<schema namespace="http://www.w3.org/2001/XInclude"
file="${basedir}/etc/XInclude.xsd" />
......
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"
version = "1.0"
......
targetNamespace="http://homegatewayinitiative.org/xml/dal/4.0"
xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
targetNamespace="http://www.onem2m.org/xml/sdt/4.0"
xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
<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"/>
<typeId id="DAL" uri="dal.rnc"/>
......
......@@ -115,18 +115,21 @@
Washing machine setting
This property indicates the current stage of the washing cycle.
This property indicates the time remaining to complete the current washing cycle in the HH:MM:SS format.
......@@ -142,6 +145,7 @@
Timer value (HH:MM)
......
......@@ -11,14 +11,13 @@
Obtain the current associated state.
Set the associated state to the specified value.
Set the associated state to the specified value.
The desired value of the associated state.
......@@ -29,3 +28,6 @@
......@@ -4,60 +4,43 @@
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
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.
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".
Query the state of the switch. Returns the string "on"
or "off".
An event that indicates the new state of the switch.
An event that indicates the new state of the switch.
......
......@@ -19,10 +19,14 @@
Set the associated state to the specified value.
The desired value of the associated state.
......@@ -47,17 +51,38 @@
Multi Socket Electrical-Extension-Block
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
......@@ -65,6 +90,58 @@
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".
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
......@@ -78,6 +155,9 @@
This datapoint is an array of strings with the names of the contained devices.
......@@ -93,8 +173,11 @@
PowerSwitch 1
HGI
This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
......@@ -110,8 +193,12 @@
PowerSwitch 2
HGI
This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
......@@ -121,6 +208,20 @@
......
......@@ -9,8 +9,8 @@
- See the license text at [https://opensource.org/licenses/BSD-3-Clause for
- full details.
-->
<xs:schema targetNamespace="http://homegatewayinitiative.org/xml/dal/4.0"
xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
<xs:schema targetNamespace="http://www.onem2m.org/xml/sdt/4.0"
xmlns="http://www.onem2m.org/xml/sdt/4.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified">
......
......@@ -8,7 +8,7 @@
document ... -->
<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:redirect="http://xml.apache.org/xalan/redirect"
......
......@@ -3,7 +3,7 @@
<!-- 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"
id="example.based.on.echonetLite">
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- 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>
<ModuleClass name="TestActions">
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- 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>
<ModuleClass name="TestArg">
......
<?xml version="1.0" encoding="iso-8859-1"?>
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
id="hgi.dal.core">
<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
id="dal.core">
<ModuleClasses>
<ModuleClass name="BooleanState">
......
<?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>
<xi:include href="./dal-core.xml" parse="xml"/>
</Imports>
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- 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>
<ModuleClass name="TestDataPoint">
<Data>
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- 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>
<DataType name="temperatureType" unitOfMeasure="C">
<SimpleType type="float"/>
......
<?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>
<xi:include href="./dal-core.xml" parse="xml"/>
</Imports>
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- 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>
<ModuleClass name="TestEnumType">
<Data>
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- 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"
id="example1.SDT">
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- 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"
id="example2.SDT">
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- 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"
id="example3.SDT">
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- 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>
<ModuleClass name="TestExtendsParent">
<Data>
......
......@@ -5,7 +5,7 @@
<!--
+................................................+
:Domain:org.homegatewayinitiative :
:Domain:org.onem2m :
: :
: +..........................................+ :
: :Module:BooleanState : :
......@@ -62,8 +62,8 @@
-->
<Domain xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
id="org.homegatewayinitiative">
xmlns="http://www.onem2m.org/xml/sdt/4.0"
id="org.onem2m">
<!-- The following import statements include ModuleClasses from HGI -->
......@@ -139,7 +139,7 @@
<SimpleType type="string" />
</Property>
<Property name="VendorURL">
<Doc>Original value: http://www.homegatewayinitative.org</Doc>
<Doc>Original value: http://www.onem2m.org</Doc>
<SimpleType type="uri" />
</Property>
<Property name="SerialNumber">
......@@ -283,7 +283,7 @@
<Property name="Vendor" value="HGI">
<SimpleType type="string" />
</Property>
<Property name="VendorURL" value="http://homegatwaysinitiative.org">
<Property name="VendorURL" value="http://www.onem2m.org">
<SimpleType type="uri" />
</Property>
<Property name="maximumAltitude" value="2800">
......
<?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" >
<Products>
<Product id="TestProduct" semanticURI="http://example.com/TestProduct.rdf">
<Doc>This is a test product</Doc>
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the data types references -->
<Domain id="semanticURI-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" semanticURI="http://example.com/semanticURI-test.rdf">
<Domain id="semanticURI-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" semanticURI="http://example.com/semanticURI-test.rdf">
<DataTypes>
<DataType name="temperatureType" unitOfMeasure="C" semanticURI="http://example.com/temperatureType.rdf">
<SimpleType type="float"/>
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Test the void BasicType -->
<Domain id="void-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<Domain id="void-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses>
<ModuleClass name="TestVoid">
<Actions>
......
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