Skip to content
Snippets Groups Projects
Commit 901b45c3 authored by ankraft's avatar ankraft
Browse files

Prepared for 4.0 transition.

parent b0394a28
No related branches found
No related tags found
No related merge requests found
......@@ -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/3.0"
<schema namespace="http://homegatewayinitiative.org/xml/dal/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/3.0"
default namespace xsl = "http://homegatewayinitiative.org/xml/dal/4.0"
namespace xi = "http://www.w3.org/2001/XInclude"
version = "1.0"
......
......@@ -65,12 +65,12 @@ BasicType =
| "byte"
| "float"
| "array"
| "enum"
| "date"
| "time"
| "datetime"
| "blob"
| "uri"
| "void"
ConstraintsDef =
element Constraints {
element Constraint {
......
targetNamespace="http://homegatewayinitiative.org/xml/dal/3.0"
xmlns="http://homegatewayinitiative.org/xml/dal/3.0"
targetNamespace="http://homegatewayinitiative.org/xml/dal/4.0"
xmlns="http://homegatewayinitiative.org/xml/dal/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/2.0" typeId="DAL"/>
<namespace ns="http://homegatewayinitiative.org/xml/dal/4.0" typeId="DAL"/>
<namespace ns="http://www.w3.org/2001/XInclude" typeId="XINC"/>
<typeId id="DAL" uri="dal.rnc"/>
......
......@@ -3,7 +3,7 @@
<!-- Example SDT definition taken from EchonetLite https://github.com/ECHONET-Consortium -->
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/3.0"
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
xmlns:xi="http://www.w3.org/2001/XInclude"
id="example.based.on.echonetLite">
......@@ -119,19 +119,22 @@
<DataPoint name="door/CoverOpen/CloseStatus" readable="true" writable="false">
<Doc>This property indicates whether the door/cover is open or closed.</Doc>
<DataType>
<SimpleType type="enum" />
<!-- <SimpleType type="enum" /> -->
<SimpleType type="string" />
</DataType>
</DataPoint>
<DataPoint name="washingMachineSetting" readable="true" writable="true">
<Doc>Washing machine setting</Doc>
<DataType>
<SimpleType type="enum" />
<!-- <SimpleType type="enum" /> -->
<SimpleType type="string" />
</DataType>
</DataPoint>
<DataPoint name="currentStageOfWashingCycle" readable="true" writable="false">
<Doc>This property indicates the current stage of the washing cycle.</Doc>
<DataType>
<SimpleType type="enum" />
<!-- <SimpleType type="enum" /> -->
<SimpleType type="string" />
</DataType>
</DataPoint>
<DataPoint name="timeRemainingToCompleteWashingCycle" readable="true" writable="false">
......@@ -149,7 +152,8 @@
<DataPoint name="onTimerReservationSetting" readable="true" writable="true">
<Doc>Reservation ON/OFF</Doc>
<DataType>
<SimpleType type="enum" />
<!-- <SimpleType type="enum" /> -->
<SimpleType type="boolean" />
</DataType>
</DataPoint>
<DataPoint name="onTimerSetting" readable="true" writable="true">
......
<?xml version="1.0" encoding="iso-8859-1"?>
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/3.0"
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
id="hgi.dal.core">
<Modules>
......
<?xml version="1.0" encoding="iso-8859-1"?>
<Domain xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns="http://homegatewayinitiative.org/xml/dal/3.0"
xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
id="com.telekom">
<Imports>
......
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Example1 SDT inspired by some Echonet Lite examples -->
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/3.0"
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/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/3.0"
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/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/3.0"
<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
xmlns:xi="http://www.w3.org/2001/XInclude"
id="example3.SDT">
......
......@@ -62,7 +62,7 @@
-->
<Domain xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns="http://homegatewayinitiative.org/xml/dal/3.0"
xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
id="org.homegatewayinitiative">
<!-- The following import statements include ModuleClasses from HGI -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment