Merge branch 'WI-0081-Smart_Device_Template_4_0' into...

Merge branch 'WI-0081-Smart_Device_Template_4_0' into RDM-2019-0003-SDT_4_0_–_Proposed_Changes_to_XSD

LICENSE

-Copyright 2018, oneM2M Partners Type 1
+Copyright 2019, oneM2M Partners Type 1
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
@@ -8,4 +8,4 @@ Redistribution and use in source and binary forms, with or without modification,
 
 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

 # Smart Device Template
 
-Repository for the Smart Device Template (SDT).
+Repository and documentation for the Smart Device Template (SDT).
 
 **Version 4.0**
 
-Note that this project runs under the 3-Clause BSD License. Read the [LICENSE](LICENSE) in this repository, or refer to  [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause).
+The Smart Device Template is available under the 3-Clause BSD License. Read the [LICENSE](LICENSE) in this repository, or refer to  [https://opensource.org/licenses/BSD-3-Clause](https://opensource.org/licenses/BSD-3-Clause).
 
-Any contributions made to this project must comply with the aforementioned license.
+Any contributions made to the Smart Device Template format must comply with the aforementioned license. Models defined by using the Smart Device Template can be published under different licenses.
 
 ## Quick Introduction
 
-The Smart Device Template (SDT) is a template which is used to model the capabilities, actions and events of connected devices. The intent of the SDT is to be able to model any type of connected device using a well accepted and standardised format. The main application of SDT is to enable a uniformly structured Application Programmer's Interface (API) to applications that need to interact with connected devices. Usually, these applications would communicate to devices using an Abstraction Layer as an intermediary logic. The Abstraction Layer "hides" the technology-specific, native language format of devices of different technology type from the applications.
+![](SDT/schema4.0/docs/images/SDT_simplified.png)
+
+The Smart Device Template (SDT) is a template which is used to model the capabilities, actions and events of connected devices. The intent of the SDT is to be able to model any type of connected device using a well accepted and standardised format. The main application of SDT is to enable a uniformly structured Application Programmer's Interface (API) to applications that need to interact with connected devices. Usually, these applications would communicate to devices using an abstraction layer as an intermediary logic. The abstraction layer "hides" the technology-specific, native language format of devices of different technology type from the applications.
 
 [Read the full Introduction.](SDT/schema4.0/docs/Introduction.md)
 
 ## Quick Links
-- ['domain.xsd' Version 4.0](SDT/schema4.0/src/domain.xsd)
-- [UML Diagram of the SDT 4.0](SDT/schema4.0/docs/UML%20Diagram.md) ([source](SDT/schema4.0/docs/SDT_UML.uxf))
+- [UML Diagram of the SDT 4.0](SDT/schema4.0/docs/UML%20Diagram.md) ([Umlet source](SDT/schema4.0/docs/SDT_UML.uxf)) : This UML diagram describes the various components of the SDT and their relations.
+- ['domain.xsd' Version 4.0](SDT/schema4.0/src/domain.xsd) : This is the XSD schema file that defines the SDT XML Schema.
 
 
-## Content
+## Documentation
 
 You can find further Information here:
 
 - [Introduction to the SDT](SDT/schema4.0/docs/Introduction.md)
 - [SDT Components](SDT/schema4.0/docs/SDT_Components.md)
-- [JSON Serializatoin](SDT/schema4.0/docs/SDT_JSON.md)
-- [SDT Build System](SDT/schema4.0/docs/SDT%20Build%20System.md)
+- [JSON Serialization](SDT/schema4.0/docs/SDT_JSON.md)
 - [Examples](SDT/schema4.0/docs/Examples.md) 
+- [SDT Build System](SDT/schema4.0/docs/SDT%20Build%20System.md)
+
+## Further Readings
 - [Links & References](SDT/schema4.0/docs/Links.md)
+- [FAQ](SDT/schema4.0/docs/FAQ.md)
 - [Changelog](SDT/schema4.0/docs/Changelog.md)
+- [SDT Build System Components and Licenses](SDT/schema4.0/docs/SDT%20Build%20System%20Components%20and%20Licenses.md)
 - [LICENSE](LICENSE)
 
 

SDT/schema4.0/build.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 
-<!-- - HGI Device Abstraction Layer  - - - - - - - - - - - - - - - - - - - - -->
+<!--   SDT - Smart Device Template Build File                                -->
 <!--                                                                         -->
-<!--   Extends the standard build with targets for: 			     -->
-<!--    - generate XML schema the from Relax NG (xml) description	     -->
-<!--    - validate DAL documents against the XML Schema			     -->
-<!--    - generate HTML documentation from DAL documents 		     -->
+<!--   Extends the standard build with targets for:                          -->
+<!--    - generate XML schema the from Relax NG (xml) description            -->
+<!--    - validate DAL documents against the XML Schema                      -->
+<!--    - generate HTML documentation from DAL documents                     -->
 
 <project name="importing" basedir="." default="schemas">
   <import file="etc/common.xml"/>

SDT/schema4.0/docs/Changelog.md

 # Changelog
 
 ## Changes in 4.0
-- Rename 'Device' to 'DeviceClass' [(issue#2)](https://git.onem2m.org/MAS/SDT/issues/2)
-- Remove 'Module' to simplify the SDT model [(issue#1)](https://git.onem2m.org/MAS/SDT/issues/1)
-- Introduced 'Product' for concrete model definition of real products. [(issue#6)](https://git.onem2m.org/MAS/SDT/issues/6)
-- Support JSON serialization [(issue#5)](https://git.onem2m.org/MAS/SDT/issues/5)
-- Support inheritance of 'DeviceClass' [(issue#3)](https://git.onem2m.org/MAS/SDT/issues/3)
-- Enum type ...
-- Data Type Facets ... [(issue#4)](https://git.onem2m.org/MAS/SDT/issues/4)
-- ...
-
-*Editor's note: the current change log is just an examplary list (a projection), which lists some initial thoughts that the group is working on based on previous discussion. It needs to be revisited according to all implemented features before SDT4.0 publication.*
+- Renamed ``<Device>`` to ``<DeviceClass``>.
+- Removed ``<Module>`` to simplify the SDT model.
+- Introduced ``<ProductClass`` for concrete model definition of real products.
+- Introduced complex ``<EnumType>`` data type. Removed ``enum`` data type from ``BasicTypes``.
+- Added ``void`` from ``BasicTypes``.
+- Introduced inheritance / extending of ``<DataType>``.
+- Added support for defining ``<DataType>`` on ``<Domain>`` level.
+- Changed ``<Extend>`` mechanism. Now one can explicitly include or exclude certain sub-components from the parent.
+- Added support of ``semanticURL`` attribute for all components.
+- Added ``optional`` attribute to ``<Arg>``.
+- Added ``default`` attribute to ``<Arg>``.
+- Added ``default`` attribute to ``<DataPoint``.
+- Unified all component identifiers, names etc to XSD type ``name``.
+- Introduced JSON serialization guidelines.
+- Changed case of ``<Imports>`` element.
+- Added more test cases and 	example templates to the [test](../test) directory.
+- Changed the license to [3-Clause BSD License](https://opensource.org/licenses/BSD-3-Clause).
 
 ## Changes in 3.0
 - Renamed ``<RootDevice>``to ``<Device>`` and ``<Device>`` to ``<SubDevice>``,

SDT/schema4.0/docs/FAQ.md

 # Frequently Asked Questions
 
-## What is the HGI?
-tbd
 
-## What is the SDT?
-tbd
+1. [General](#general)
+	1. [What is the SDT?](#WhatistheSDT)
+	2. [What is oneM2M?](#echonetExampleMC)
+2. [Working with the SDT](#working)
+ 	1. [What is the SDT?](#build)
+ 	2. [How to validate own templates](#validate)
+ 	3. [Are there tools to work with the SDT?](#tools)
+
+<a name="general"></a>
+## General
+
+<a name="WhatistheSDT"></a>
+### What is the SDT?
+The Smart Device Template (SDT) is a template which is used to model the capabilities, actions and events of connected devices. The intent of the SDT is to be able to model any type of connected device using a well accepted and standardised format. The main application of SDT is to enable a uniformly structured Application Programmer’s Interface (API) to applications that need to interact with connected devices. 
+
+<a name="WhatisoneM2M"></a>
+### What is oneM2M?
+oneM2M is a global organization that creates requirements, architecture, API specifications, security solutions and interoperability for Machine-to-Machine and IoT technologies.
+
+The purpose and goal of oneM2M is to develop technical specifications which address the need for a common M2M Service Layer that can be readily embedded within various hardware and software, and relied upon to connect the myriad of devices in the field with M2M application servers worldwide. A critical objective of oneM2M is to attract and actively involve organizations from M2M-related business domains such as: telematics and intelligent transportation, healthcare, utilities, industrial automation, smart homes, etc. Initially, oneM2M shall prepare, approve and maintain the necessary set of Technical Specifications and Technical Reports for:
+
+- Use cases and requirements for a common set of Service Layer capabilities;
+Service Layer aspects with high level and detailed service architecture, in light of an access independent view of end-to-end services;
+- Protocols/APIs/standard objects based on this architecture (open interfaces & protocols);
+- Security and privacy aspects (authentication, encryption, integrity verification);
+- Reachability and discovery of applications;
+- Interoperability, including test and conformance specifications;
+- Collection of data for charging records (to be used for billing and statistical purposes);
+- Identification and naming of devices and applications;
+- Information models and data management (including store and subscribe/notify functionality);
+- Management aspects (including remote management of entities); and
+- Common use cases, terminal/module aspects, including Service Layer interfaces/APIs between:
+- Application and Service Layers;
+- Service Layer and communication functions
+
+[http://www.onem2m.org](http://www.onem2m.org)
+
+<a name="working"></a>
+## Working with the SDT
+
+<a name="working"></a>
+### How to build the SDT
+Please follow the instructions for the [SDT Build System](SDT/schema4.0/docs/SDT%20Build%20System.md).
+
+In short:
+
+- In a terminal, go to the directoy *SDT/schema4.0*
+- Run the command:
+```sh 
+$ ant
+```
+
+<a name="validate"></a>
+### How to validate own templates
+Please follow the instructions for the [SDT Build System](SDT/schema4.0/docs/SDT%20Build%20System.md).
+
+In short:
+
+- Copy your template to the directory *SDT/schema4.0/test*
+- In a terminal, go to the directoy *SDT/schema4.0*
+- Run the command:
+```sh 
+$ ant validate
+```
+
+<a name="tools"></a>
+### Are there tools to work with the SDT?
+You can use the SDTTool to read and convert templates in SDT format to various output formats, e.g. XSD, SVG, markdown, Java code, etc.
+
+[https://github.com/Homegateway/SDTTool](https://github.com/Homegateway/SDTTool)  

SDT/schema4.0/docs/Links.md

 # Links & References
+
+
+## Smart Device Template
+- **SDT Repository** : [https://git.onem2m.org/MAS/SDT](https://git.onem2m.org/MAS/SDT)
+
+## Further Information
+
+- **TR-0039 Introduction to IPE and SDT** : [http://www.onem2m.org/tr-0039/ipe-and-sdt](http://www.onem2m.org/tr-0039/ipe-and-sdt)
+- **The oneM2M Smart Device Template (SDT)** (BrightTALK) : [https://www.brighttalk.com/webcast/11949/340004/the-onem2m-smart-device-template-sdt](https://www.brighttalk.com/webcast/11949/340004/the-onem2m-smart-device-template-sdt)
+
+
+## Organisations
+
+- **oneM2M** : [http://www.onem2m.org](http://www.onem2m.org)
 - **HGI** : [http://www.homegatewayinitiative.org](http://www.homegatewayinitiative.org)
 
-## XML
+## Tools
+- **SDTTool** : [https://github.com/Homegateway/SDTTool](https://github.com/Homegateway/SDTTool)  
+SDTTool is a utility to read and convert SDT definitions.
 - **RELAX NG** : [http://relaxng.org](http://relaxng.org)
 	- **RELAX NG Tutorial** : [http://relaxng.org/tutorial-20011203.html](http://relaxng.org/tutorial-20011203.html)
-
-## Tools
 - **UMLet**	: [http://www.umlet.com](http://www.umlet.com)  
-The free UML drawing tool used to draw the UML file.
+A free UML drawing tool used to draw the UML file.
 - **Apache Ant** : [http://ant.apache.org](http://ant.apache.org)  
 Build tool
 

SDT/schema4.0/docs/SDT Build System Components and Licenses.md

-# Build System Libraries and Licenses
-The following libraries are used in the build system for the SDT.
+# SDT Build System Components and Licenses
+The following third-party libraries and components are used in the build system for the Smart Device Template.
 
+## Table of Contents
+1. [trang.jar](#trang)
+2. [Ant-Contrib Tasks](#antcontrib)
+3. [antSetLogLevel.JAR](#antSetLogLevel)
+
+
+<a name="trang"/></a>
 ## trang.jar
 
-[http://www.thaiopensource.com/relaxng/trang-manual.html](http://www.thaiopensource.com/relaxng/trang-manual.html)
+[https://relaxng.org/jclark/trang.html](https://relaxng.org/jclark/trang.html)  
+[https://github.com/relaxng/jing-trang](https://github.com/relaxng/jing-trang)
 
 *Trang* takes as input a schema written in any of the following formats:
 
@@ -45,6 +53,7 @@ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+<a name="antcontrib"/></a>
 ## Ant-Contrib Tasks
 
 [http://ant-contrib.sourceforge.net](http://ant-contrib.sourceforge.net)
@@ -55,6 +64,7 @@ The *Ant-Contrib* project is a collection of tasks (and at one point maybe types
 
 This Software is distributed under the Apache Software License.
 
+<a name="antSetLogLevel"/></a>
 ## antSetLogLevel.jar
 
 GUI dialog for Ant tasks.

SDT/schema4.0/docs/SDT Build System.md

 # SDT Build System
-This document describes the SDT build system and how to build the SDT and validate new contributions.
+This document describes the SDT build system and how to build the SDT and validate new templates and contributions.
 
 The files referenced in this document point to version **4.0** of the SDT.
 
+## Table of Contents
+1. [Directory Structure and Important Files](#Structure)
+2. [Installation](#Installation)
+3. [Building](#Building)
+	1. [Building the Schema](#BuildingSchema)
+	2. [Validating SDT Templates](#BuildingValidate)
+4. [Editing the Schema](#Editing)
+
+<a name="Structure"/></a>
 ## Directory Structure and Important Files
 - [SDT/schema4.0/](../..) : Base directory
 - [SDT/schema4.0/src/](../src/) : Source files of the SDT.
 	- [domain.rng](../src/domain.rng) : RELAX NG file with the SDT schema definition. This is the source file that is converted to the actual schema definition *domain.xsd* during the build. See also [http://en.wikipedia.org/wiki/RELAX_NG](http://en.wikipedia.org/wiki/RELAX_NG).  
-	**Only edit this file when one wants to make changes to the SDT!**
-	- [domain.xsd](../src/domain.xsd) : The SDT schema definition that is generated from *domain.rng*.
+	**Only edit this file when you want to make changes to the SDT!** See also [Editing the Schema](#Editing) below.
+	- [domain.xsd](../src/domain.xsd) : The actual SDT schema definition that is generated from *domain.rng*.
 	- [xml.xsd](../src/xml.xsd) : General schema definitions for the SDT
-- [SDT/schema4.0/test/](../test/) : This directory contains all XML files with SDT definitions that should be validated whether they conform to the SDT schema. This could be example definitions or contributions.
+- [SDT/schema4.0/test/](../test/) : This directory contains XML files with SDT definitions that should be validated whether they conform to the SDT schema.  
+This could be example definitions or new templates and contributions. If you want to validate your newly created template put it into this directory and follow the steps descripted in [Validating SDT Templates](#BuildingValidate) below.
 - [SDT/schema4.0/build.xml](../build.xml) : This is the definition file for the ant build system.
-- [SDT/schema4.0/etc/](../etc/), [SDT/schema4.0/style/](../style/) : internal directories for the build system. Please, don't make unnecessary changes to these files.
-- [SDT/schema4.0/etc/](../etc), [SDT/schema4.0/style/](../style/) : internal directories for the build system. Please, don't make unnecessary changes to these files.
-	- [SDT/schema4.0/etc/dal.rnc](../etc/dal.rnc) : This file contains various configuration parameter to convert the file [domain.rng](../src/domain.rng) to schema file. **The important parameter to change when changing the namespace or the version number is**:
-
-			default namespace xsl = "http://homegatewayinitiative.org/xml/dal/3.0"
-
-	- [SDT/schema4.0/etc/schemas.xml](../etc/schemas.xml) : This file contains the header for the schema file. **This must be changed when changing the namespace or the version number.**
+- [SDT/schema4.0/etc/](../etc/), [SDT/schema4.0/style/](../style/) : internal directories for the build system. Please, don't make changes to these files.
+- [SDT/schema4.0/etc/](../etc), [SDT/schema4.0/style/](../style/) : internal directories for the build system. Only the following files should be changed if necessray. See the section [Editing the Schema](#Editing) below.
+	- [SDT/schema4.0/etc/dal.rnc](../etc/dal.rnc) : This file contains various configuration parameter to convert the file [domain.rng](../src/domain.rng) to schema file.
+	- [SDT/schema4.0/etc/schemas.xml](../etc/schemas.xml) : This file contains the header for the schema file.
+	- [SDT/schema4.0/etc/schema.xmlns](../etc/schema.xmlns) : This file defines the target namespace for the schema.
 - [SDT/schema4.0/lib/](../lib/) : Tasks for the ant-based build system. See also [SDT Build System Components and Licenses](SDT%20Build%20System%20Components%20and%20Licenses.md).
 
+<a name="Installation"/></a>
 ## Installation
-- Install Java on your computer
-- Download and install Apache ant from [http://ant.apache.org](http://ant.apache.org)
-- Clone the SDT repository from GitHub:
 
-		$ git clone https://github.com/Homegateway/SmartDeviceTemplate.git
-	
+### Prerequisites
+- Java
+- Ant (at least version 1.8). See [http://ant.apache.org](http://ant.apache.org).
+
+### Installing SDT
+- Clone the SDT repository from oneM2M's GitLab:
+
+		$ git clone https://git.onem2m.org/MAS/SDT.git
+
+<a name="Building"/></a>
 ## How to Use the Build System
-After cloning the repository go to the directory *SDT/schema* and run commands depending on what you want to achieve.
+After cloning the repository go to the directory *SDT/schema4.0* and run commands depending on what you want to achieve.
 
-### Build the Schema
+<a name="BuildingSchema"/></a>
+### Building the Schema
 Running *ant* without any parameter builds the schema definition from the rng-definition [SDT/schema4.0/src/domain.rng](../src/domain.rng) and writes it to [SDT/schema4.0/src/domain.xsd](../src/domain.xsd)
 
-	$ cd SDT/schema
+	$ cd SDT/schema4.0
 	$ ant
 
-### Validate SDT Definitions
+<a name="BuildingValidate"/></a>
+### Validating SDT Templates
 You can use the build system to validate new SDT definitions or changes made to existing ones by running the following command:
 
-	$ cd SDT/schema
+	$ cd SDT/schema4.0
 	$ ant validate
 
-The output after a successful validation should look like this:
+The output after a successful validation should look similar this:
 
 >[schemavalidate] 2 file(s) have been successfully validated.  
 >BUILD SUCCESSFUL  
@@ -54,20 +70,30 @@ Otherwise you most likely receive a stack trace or some other error messages. Se
 >[schemavalidate] /Users/someone/Sources/git/SmartDeviceTemplate/SDT/schema/test/mseeb.xml:66:18: cvc-elt.1: Cannot find the declaration of element 'Domain'.    
 >BUILD FAILED
 
----
+<a name="Editing"/></a>
+##  Editing the Schema
+As mentioned above, the actual schema definition is defined in the file [src/domain.rng](../src/domain.rng) and converted to the XML schema definition [src/domain.xsd](../src/domain.xsd) during the build process. 
 
-##  Editing
-As mentioned above, the actual schema definition is defined in the file [domain.rng](../src/domain.rng) and converted to the XML schema definition [domain.xsd](../src/domain.xsd) during the build process. 
-
-**All changes to the schema must therefore be made in [domain.rng](../src/domain.rng), NOT [domain.xsd](../src/domain.xsd) !**
+**All changes to the schema must only be made to [src/domain.rng](../src/domain.rng), NOT [src/domain.xsd](../src/domain.xsd) !**
 
 You may need to make additional changes in the following files, e.g. when the name space or the version number need to be adjusted.
 
-PLEASE ONLY EDIT THESE FILES IF NECESSARY. 
+PLEASE EDIT THESE FILES ONLY IF NECESSARY. 
 
 - [SDT/schema4.0/build.xml](../build.xml)  
-e.g. in the *ant* target "validate"
+e.g. change the *ant* target "validate" when you want to set another directory for the files for validation.
 - [SDT/schema4.0/etc/dal.rnc](../etc/dal.rnc)  
-e.g. the entry "default namespace xsl"
-- [SDT/schema4.0/etc/schema.xmlns](../etc/schema.xmlns)
-- [SDT/schema4.0/etc/schemas.xml](../etc/schemas.xml)
+The important parameter to update when changing the namespace or the version number is:
+
+		default namespace xsl = "http://www.onem2m.org/xml/sdt/4.0"
+- [SDT/schema4.0/etc/schema.xmlns](../etc/schema.xmlns)  
+	This file must be updated when changing the namespace or the version number:
+
+		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" 
+- [SDT/schema4.0/etc/schemas.xml](../etc/schemas.xml)  
+	Upate the namespace when changing the namespace or the version number:
+
+		<namespace ns="http://www.onem2m.org/xml/sdt/4.0" typeId="DAL"/>
+

SDT/schema4.0/docs/UML Diagram.md

 # UML Diagram of the SDT 4.0
 
-The source for the diagrams below is [here](SDT_UML.uxf).
+The source for the diagrams below can be found [here (SDT_UML.uxf)](SDT_UML.uxf).
+
+## Key
+
+![](images/SDT_UML_Key.png)
+
 ## Basic Elements
 
 ![](images/SDT_UML_Basic_Elements.png)
@@ -9,6 +14,6 @@ The source for the diagrams below is [here](SDT_UML.uxf).
 
 ![](images/SDT_UML_DataType.png)
 
-## Key
+## Extend
 
-![](images/SDT_UML_Key.png)
+![](images/SDT_UML_Extend.png)

SDT/schema4.0/gen/html/action-test.html

+<?xml version="1.0" encoding="ISO-8859-1"?>

SDT/schema4.0/gen/html/action-test/index.html

+<?xml version="1.0" encoding="ISO-8859-1"?><html xmlns:dal="http://www.onem2m.org/xml/sdt/4.0" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Domain action-test</title>
+</head>
+<body>
+<h1>Domain action-test</h1>
+<h2>Devices</h2>
+<ul/>
+</body>
+</html>

SDT/schema4.0/gen/html/arg-test.html

+<?xml version="1.0" encoding="ISO-8859-1"?>

SDT/schema4.0/gen/html/arg-test/index.html

+<?xml version="1.0" encoding="ISO-8859-1"?><html xmlns:dal="http://www.onem2m.org/xml/sdt/4.0" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Domain arg-test</title>
+</head>
+<body>
+<h1>Domain arg-test</h1>
+<h2>Devices</h2>
+<ul/>
+</body>
+</html>

SDT/schema4.0/gen/html/datapoint-test.html

+<?xml version="1.0" encoding="ISO-8859-1"?>

SDT/schema4.0/gen/html/datapoint-test/index.html

+<?xml version="1.0" encoding="ISO-8859-1"?><html xmlns:dal="http://www.onem2m.org/xml/sdt/4.0" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Domain datapoint-test</title>
+</head>
+<body>
+<h1>Domain datapoint-test</h1>
+<h2>Devices</h2>
+<ul/>
+</body>
+</html>

SDT/schema4.0/gen/html/datatypes-test.html

+<?xml version="1.0" encoding="ISO-8859-1"?>

SDT/schema4.0/gen/html/datatypes-test/index.html

+<?xml version="1.0" encoding="ISO-8859-1"?><html xmlns:dal="http://www.onem2m.org/xml/sdt/4.0" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Domain datatypes-test</title>
+</head>
+<body>
+<h1>Domain datatypes-test</h1>
+<h2>Devices</h2>
+<ul/>
+</body>
+</html>

SDT/schema4.0/gen/html/deviceClass-test.html

+<?xml version="1.0" encoding="ISO-8859-1"?>

SDT/schema4.0/gen/html/deviceClass.test/index.html

+<?xml version="1.0" encoding="ISO-8859-1"?><html xmlns:dal="http://www.onem2m.org/xml/sdt/4.0" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Domain deviceClass.test</title>
+</head>
+<body>
+<h1>Domain deviceClass.test</h1>
+<h2>Devices</h2>
+<ul/>
+</body>
+</html>

SDT/schema4.0/gen/html/enumtype-test.html

+<?xml version="1.0" encoding="ISO-8859-1"?>

SDT/schema4.0/gen/html/enumtype-test/index.html

+<?xml version="1.0" encoding="ISO-8859-1"?><html xmlns:dal="http://www.onem2m.org/xml/sdt/4.0" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Domain enumtype-test</title>
+</head>
+<body>
+<h1>Domain enumtype-test</h1>
+<h2>Devices</h2>
+<ul/>
+</body>
+</html>

SDT/schema4.0/gen/html/example1.SDT.html

 <?xml version="1.0" encoding="ISO-8859-1"?>
-
-	
-
-		
-		
-			
-				
-					This property sets the ON/OFF status.
-						
-							 
-						
-				
-			
-			
-				
-				
-			
-		
-
-
-		
-			
-				
-					This property indicates the installation location
-					
-						
-					
-				
-			
-			
-				 
-			
-		
-
-		
-			
-				
-					This indicates cumulative power consumption of the device in increments of 0.001kWh.
-					
-						
-					
-				
-			
-		
-
-		
-			
-				
-					Timer value (HH:MM)
-					
-						
-					
-				
-			
-		
-
-		
-			
-				
-					This reads the open=true or closed=false status of a door 
-					
-						
-					
-				
-			
-		
-
-	
-

SDT/schema4.0/gen/html/example1.SDT/index.html

+<?xml version="1.0" encoding="ISO-8859-1"?><html xmlns:dal="http://www.onem2m.org/xml/sdt/4.0" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Domain example1.SDT</title>
+</head>
+<body>
+<h1>Domain example1.SDT</h1>
+<h2>Devices</h2>
+<ul/>
+</body>
+</html>

SDT/schema4.0/gen/html/example2.SDT.html

 <?xml version="1.0" encoding="ISO-8859-1"?>
-
-    
-        
-    
-
-	
-		
-			
-				
-					
-				
-				
-