Joerg Swetina · 3f9a1103
--- a/base_ontology.owl

+ 280

− 38
+++ b/base_ontology.owl

+ 280

− 38
 @@ -8,7 +8,7 @@
 @@ -8,7 +8,7 @@
     xmlns:base_ontology="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#"
     xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
    <Ontology rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology">
-        <versionIRI rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology-v3_2_0"/>
+        <versionIRI rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology-v3_3_0"/>
        <rdfs:comment>This file contains the Base Ontology of oneM2M as specified in TS-0012
 =========================================
 @@ -20,7 +20,7 @@ The oneM2M Partners assume no responsibility for errors or omissions in this doc
 @@ -20,7 +20,7 @@ The oneM2M Partners assume no responsibility for errors or omissions in this doc
 (c) 2016, oneM2M Partners Type 1 (ARIB, ATIS, CCSA, ETSI, TIA, TSDSI, TTA, TTC). All rights reserved.
-Notice of Disclaimer &amp; Limitation of Liability
+Notice of Disclaimer and Limitation of Liability
 The information provided in this document is directed solely to professionals who have the appropriate degree of experience to understand and interpret its contents in accordance with generally accepted engineering or other professional standards and applicable regulations.
 No recommendation as to products or vendors is made or should be implied.
 @@ -299,7 +299,7 @@ the cardinality of hasSubService must be - min 1.</rdfs:comment>
 @@ -299,7 +299,7 @@ the cardinality of hasSubService must be - min 1.</rdfs:comment>
    <ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasThingProperty">
        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Thing"/>
        <rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#ThingProperty"/>
-        <rdfs:isDefinedBy>A Thing may have properties that can be described by Values</rdfs:isDefinedBy>
+        <rdfs:comment>A Thing may have properties that can be described by Values</rdfs:comment>
    </ObjectProperty>
 @@ -309,7 +309,7 @@ the cardinality of hasSubService must be - min 1.</rdfs:comment>
 @@ -309,7 +309,7 @@ the cardinality of hasSubService must be - min 1.</rdfs:comment>
    <ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasThingRelation">
        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Thing"/>
        <rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Thing"/>
-        <rdfs:isDefinedBy>A Thing may have relations to itself or to other Things (e-g. a Thing &quot;Room&quot; could have a relation &quot;has_Door&quot; with a Thing &quot;Door&quot;)</rdfs:isDefinedBy>
+        <rdfs:comment>A Thing may have relations to itself or to other Things (e-g. a Thing &quot;Room&quot; could have a relation &quot;has_Door&quot; with a Thing &quot;Door&quot;)</rdfs:comment>
    </ObjectProperty>
 @@ -319,7 +319,7 @@ the cardinality of hasSubService must be - min 1.</rdfs:comment>
 @@ -319,7 +319,7 @@ the cardinality of hasSubService must be - min 1.</rdfs:comment>
    <ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#isPartOf">
        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#InterworkedDevice"/>
        <rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#AreaNetwork"/>
-        <rdfs:isDefinedBy>An InterworkedDevice constitutes a part of an AreaNetwork</rdfs:isDefinedBy>
+        <rdfs:comment>An InterworkedDevice constitutes a part of an AreaNetwork</rdfs:comment>
    </ObjectProperty>
 @@ -329,8 +329,8 @@ the cardinality of hasSubService must be - min 1.</rdfs:comment>
 @@ -329,8 +329,8 @@ the cardinality of hasSubService must be - min 1.</rdfs:comment>
    <ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#refersTo">
        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Function"/>
        <rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Aspect"/>
-        <rdfs:isDefinedBy>A Functionality of a Device can refer to a certain Aspect (a quality or kind) that is measured or controlled by that Functionality. 
+        <rdfs:comment>A Functionality of a Device can refer to a certain Aspect (a quality or kind) that is measured or controlled by that Functionality. 
-e.g. a temperature sensor would refer to the Aspect &quot;Temperature&quot; that it measures</rdfs:isDefinedBy>
+e.g. a temperature sensor would refer to the Aspect &quot;Temperature&quot; that it measures</rdfs:comment>
    </ObjectProperty>
 @@ -361,6 +361,10 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
 @@ -361,6 +361,10 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
    <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_langRange">
        <rdfs:subPropertyOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
+        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
+        <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+        <rdfs:comment>This Data Property specifies the restrictions on the data type rdf:PlainLiteral of the SimpleTypeVariable to subset a of strings containing a language tag defind by this restriction.
+E.g.  the subset of the value space of rdf:PlainLiteral corresponding to the facet pair ( rdf:langRange &quot;de-DE&quot; ) contains the pairs &lt; &quot;abc&quot; , &quot;de-de&quot; &gt; and &lt; &quot;abc&quot; , &quot;de-de-1996&quot; &gt; (because these match the language range &quot;de-DE&quot; according to RFC 4647), but not the string &quot;abc&quot; (because it is not a pair with a language tag) or the pairs &lt; &quot;abc&quot; , &quot;de-deva&quot; &gt; and &lt; &quot;abc&quot; , &quot;de-latn-de&quot; &gt; (because these do not match the language range &quot;de-DE&quot; according to RFC 4647)</rdfs:comment>
    </DatatypeProperty>
 @@ -369,6 +373,21 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
 @@ -369,6 +373,21 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
    <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_length">
        <rdfs:subPropertyOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
+        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
+        <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#long"/>
+        <rdfs:comment>This Data Property specifies the exact number of characters or list items allowed of the SimpleTypeVariable. Must be equal to or greater than zero.
+it applies to: 
+-	rdf:PlainLiteral
+-	xsd:string 
+-	xsd:normalizedString 
+-	xsd:token 
+-	xsd:language 
+-	xsd:Name 
+-	xsd:NCName 
+-	xsd:NMTOKEN 
+-	xsd:anyURI
+-	xsd:hexBinary 
+-	xsd:base64Binary</rdfs:comment>
    </DatatypeProperty>
 @@ -377,6 +396,49 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
 @@ -377,6 +396,49 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
    <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_maxExclusive">
        <rdfs:subPropertyOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
+        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
+        <rdfs:range>
+            <rdfs:Datatype>
+                <unionOf rdf:parseType="Collection">
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#byte"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#decimal"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#int"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#integer"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#long"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#negativeInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonPositiveInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#positiveInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#short"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedByte"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedInt"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedLong"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedShort"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#rational"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#real"/>
+                </unionOf>
+            </rdfs:Datatype>
+        </rdfs:range>
+        <rdfs:comment>This Data Property specifies the  upper bounds for numeric values (the value must be less than this value) allowed for the SimpleTypeVariable. 
+It applies to: 
+-	owl:real 
+-	owl:rational 
+-	xsd:decimal 
+-	xsd:integer 
+-	xsd:nonNegativeInteger 
+-	xsd:nonPositiveInteger 
+-	xsd:positiveInteger 
+-	xsd:negativeInteger 
+-	xsd:long 
+-	xsd:int 
+-	xsd:short 
+-	xsd:byte 
+-	xsd:unsignedLong 
+-	xsd:unsignedInt 
+-	xsd:unsignedShort 
+-	xsd:unsignedByte 
+-	xsd:dateTime 
+-	xsd:dateTimeStamp</rdfs:comment>
    </DatatypeProperty>
 @@ -385,6 +447,49 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
 @@ -385,6 +447,49 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
    <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_maxInclusive">
        <rdfs:subPropertyOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
+        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
+        <rdfs:range>
+            <rdfs:Datatype>
+                <unionOf rdf:parseType="Collection">
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#byte"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#decimal"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#int"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#integer"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#long"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#negativeInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonPositiveInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#positiveInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#short"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedByte"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedInt"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedLong"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedShort"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#rational"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#real"/>
+                </unionOf>
+            </rdfs:Datatype>
+        </rdfs:range>
+        <rdfs:comment>This Data Property specifies the  upper bounds for numeric values (the value must be less than or equal to this value) allowed for the SimpleTypeVariable. 
+It applies to: 
+-	owl:real 
+-	owl:rational 
+-	xsd:decimal 
+-	xsd:integer 
+-	xsd:nonNegativeInteger 
+-	xsd:nonPositiveInteger 
+-	xsd:positiveInteger 
+-	xsd:negativeInteger 
+-	xsd:long 
+-	xsd:int 
+-	xsd:short 
+-	xsd:byte 
+-	xsd:unsignedLong 
+-	xsd:unsignedInt 
+-	xsd:unsignedShort 
+-	xsd:unsignedByte 
+-	xsd:dateTime 
+-	xsd:dateTimeStamp</rdfs:comment>
    </DatatypeProperty>
 @@ -393,6 +498,21 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
 @@ -393,6 +498,21 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
    <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_maxLength">
        <rdfs:subPropertyOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
+        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
+        <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#long"/>
+        <rdfs:comment>This Data Property specifies the maximum number of characters or list items allowed of the SimpleTypeVariable. Must be equal to or greater than zero.
+it applies to: 
+-	rdf:PlainLiteral
+-	xsd:string 
+-	xsd:normalizedString 
+-	xsd:token 
+-	xsd:language 
+-	xsd:Name 
+-	xsd:NCName 
+-	xsd:NMTOKEN 
+-	xsd:anyURI
+-	xsd:hexBinary 
+-	xsd:base64Binary</rdfs:comment>
    </DatatypeProperty>
 @@ -401,6 +521,49 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
 @@ -401,6 +521,49 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
    <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_minExclusive">
        <rdfs:subPropertyOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
+        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
+        <rdfs:range>
+            <rdfs:Datatype>
+                <unionOf rdf:parseType="Collection">
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#byte"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#decimal"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#int"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#integer"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#long"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#negativeInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonPositiveInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#positiveInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#short"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedByte"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedInt"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedLong"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedShort"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#rational"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#real"/>
+                </unionOf>
+            </rdfs:Datatype>
+        </rdfs:range>
+        <rdfs:comment>This Data Property specifies the lower bounds for numeric values (the value must be greater than  this value) allowed for the SimpleTypeVariable. 
+It applies to: 
+-	owl:real 
+-	owl:rational 
+-	xsd:decimal 
+-	xsd:integer 
+-	xsd:nonNegativeInteger 
+-	xsd:nonPositiveInteger 
+-	xsd:positiveInteger 
+-	xsd:negativeInteger 
+-	xsd:long 
+-	xsd:int 
+-	xsd:short 
+-	xsd:byte 
+-	xsd:unsignedLong 
+-	xsd:unsignedInt 
+-	xsd:unsignedShort 
+-	xsd:unsignedByte 
+-	xsd:dateTime 
+-	xsd:dateTimeStamp</rdfs:comment>
    </DatatypeProperty>
 @@ -409,6 +572,49 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
 @@ -409,6 +572,49 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
    <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_minInclusive">
        <rdfs:subPropertyOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
+        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
+        <rdfs:range>
+            <rdfs:Datatype>
+                <unionOf rdf:parseType="Collection">
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#byte"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#decimal"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#int"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#integer"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#long"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#negativeInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#nonPositiveInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#positiveInteger"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#short"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedByte"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedInt"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedLong"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2001/XMLSchema#unsignedShort"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#rational"/>
+                    <rdf:Description rdf:about="http://www.w3.org/2002/07/owl#real"/>
+                </unionOf>
+            </rdfs:Datatype>
+        </rdfs:range>
+        <rdfs:comment>This Data Property specifies the lower bounds for numeric values (the value must be greater than or equal to this value) allowed for the SimpleTypeVariable. 
+It applies to: 
+-	owl:real 
+-	owl:rational 
+-	xsd:decimal 
+-	xsd:integer 
+-	xsd:nonNegativeInteger 
+-	xsd:nonPositiveInteger 
+-	xsd:positiveInteger 
+-	xsd:negativeInteger 
+-	xsd:long 
+-	xsd:int 
+-	xsd:short 
+-	xsd:byte 
+-	xsd:unsignedLong 
+-	xsd:unsignedInt 
+-	xsd:unsignedShort 
+-	xsd:unsignedByte 
+-	xsd:dateTime 
+-	xsd:dateTimeStamp</rdfs:comment>
    </DatatypeProperty>
 @@ -417,6 +623,21 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
 @@ -417,6 +623,21 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
    <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_minLength">
        <rdfs:subPropertyOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
+        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
+        <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#long"/>
+        <rdfs:comment>This Data Property specifies the minimum number of characters or list items allowed of the SimpleTypeVariable. Must be equal to or greater than zero.
+it applies to: 
+-	rdf:PlainLiteral
+-	xsd:string 
+-	xsd:normalizedString 
+-	xsd:token 
+-	xsd:language 
+-	xsd:Name 
+-	xsd:NCName 
+-	xsd:NMTOKEN 
+-	xsd:anyURI
+-	xsd:hexBinary 
+-	xsd:base64Binary</rdfs:comment>
    </DatatypeProperty>
 @@ -425,6 +646,19 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
 @@ -425,6 +646,19 @@ The Data Property &quot;hasDataRestriction&quot; shall always be sub-classed</rd
    <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_pattern">
        <rdfs:subPropertyOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
+        <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
+        <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
+        <rdfs:comment>This Data Property specifies the restrictions of the SimpleTypeVariable to a subset of strings containing the exact sequence of characters that are acceptable
+it applies to: 
+-	rdf:PlainLiteral
+-	xsd:string 
+-	xsd:normalizedString 
+-	xsd:token 
+-	xsd:language 
+-	xsd:Name 
+-	xsd:NCName 
+-	xsd:NMTOKEN 
+-	xsd:anyURI</rdfs:comment>
    </DatatypeProperty>
 @@ -813,12 +1047,6 @@ E.g. a thermostat would have &quot;temperature-adjustment&quot; as a Controlling
 @@ -813,12 +1047,6 @@ E.g. a thermostat would have &quot;temperature-adjustment&quot; as a Controlling
        <rdfs:subClassOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Thing"/>
        <rdfs:subClassOf>
            <Restriction>
-                <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#consistsOf"/>
-                <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Device"/>
-            </Restriction>
-        </rdfs:subClassOf>
-        <rdfs:subClassOf>
-            <Restriction>
                <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasService"/>
                <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Service"/>
            </Restriction>
 @@ -843,12 +1071,22 @@ In the context of oneM2M a Device is always assumed to be capable of communicati
 @@ -843,12 +1071,22 @@ In the context of oneM2M a Device is always assumed to be capable of communicati
    <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Function -->
    <Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Function">
-        <priorVersion>A Functionality (Class: Functionality) represents the functionality necessary to accomplish the task for which a Device is designed. A device can be designed to perform more than one functionality.
+        <rdfs:comment>A Functionality (Class: Functionality) represents the functionality necessary to accomplish the task for which a Device is designed. A device can be designed to perform more than one functionality.
 The functionality exhibits the – human understandable – meaning what the device &quot;does&quot;. 
 A Functionality refers to (e.g. observes or influences) some real-world aspect(s), that can be modelled as a Class: Aspect.
 E.g. considering a &quot;light switch&quot; then a related Functionality could be &quot;Controlling_ON_OFF&quot; or &quot;Controlling Brightness&quot;. These functionalities would refer to an Aspect &quot;light-control&quot;.
-A Functionality of a Device can be influenced / observed by a human user through the Commands that this Functionality has and that are offered to the user</priorVersion>
+A Functionality of a Device can be influenced / observed by a human user through the Commands that this Functionality has and that are offered to the user</rdfs:comment>
+    </Class>
+    <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#GET_InputDataPoint -->
+    <Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#GET_InputDataPoint">
+        <rdfs:subClassOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Operation"/>
+        <rdfs:comment>GET_InputDataPoint (Class: GET_InputDataPoint) is an Operation that may be offered by a Device to trigger the device to retrieve the data of an InputDataPoint 
+(e.g. outside of the schedule when the device normally retrieves data from that DataPoint)</rdfs:comment>
    </Class>
 @@ -908,6 +1146,12 @@ E.g. the indoor temperature could have meta data: &quot;Degrees Celsius&quot;</r
 @@ -908,6 +1146,12 @@ E.g. the indoor temperature could have meta data: &quot;Degrees Celsius&quot;</r
        </rdfs:subClassOf>
        <rdfs:subClassOf>
            <Restriction>
+                <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasInputDataPoint"/>
+                <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#InputDataPoint"/>
+            </Restriction>
+        </rdfs:subClassOf>
+        <rdfs:subClassOf>
+            <Restriction>
                <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOperationState"/>
                <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OperationState"/>
            </Restriction>
 @@ -918,6 +1162,12 @@ E.g. the indoor temperature could have meta data: &quot;Degrees Celsius&quot;</r
 @@ -918,6 +1162,12 @@ E.g. the indoor temperature could have meta data: &quot;Degrees Celsius&quot;</r
                <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OperationOutput"/>
            </Restriction>
        </rdfs:subClassOf>
+        <rdfs:subClassOf>
+            <Restriction>
+                <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOutputDataPoint"/>
+                <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OutputDataPoint"/>
+            </Restriction>
+        </rdfs:subClassOf>
        <rdfs:comment>An Operation (Class: Operation)  is the means of a Service to communicate in a procedure-type manner over the network (i.e. transmit data to/from other devices). It is the –machine interpretable- exposure of a –human understandable- Command to a network.
 An Operation is transient. I.e. an Operation can be invoked, possibly produces output and is finished.
 - A non-oneM2M Device or a oneM2M entity (e.g. an AE) can invoke an Operation of the Device (oneM2M Device or InterworkedDevice) and that invocation can trigger some action in the Device. If an Operation has input data it may receive input data from 
 @@ -1005,6 +1255,16 @@ An Operation correlates the output data of the Operation to the input data that 
 @@ -1005,6 +1255,16 @@ An Operation correlates the output data of the Operation to the input data that 
+    <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SET_OutputDataPoint -->
+    <Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SET_OutputDataPoint">
+        <rdfs:subClassOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Operation"/>
+        <rdfs:comment>SET_OutputDataPoint (Class: SET_OutputDataPoint) is an Operation that may be offered by a Device to trigger the device to update the data of an OutputDataPoint 
+(e.g. outside of the schedule when the device normally updates that DataPoint)</rdfs:comment>
+    </Class>
    <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Service -->
    <Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Service">
 @@ -1032,16 +1292,10 @@ An Operation correlates the output data of the Operation to the input data that 
 @@ -1032,16 +1292,10 @@ An Operation correlates the output data of the Operation to the input data that 
                <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OutputDataPoint"/>
            </Restriction>
        </rdfs:subClassOf>
-        <rdfs:subClassOf>
-            <Restriction>
-                <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasSubService"/>
-                <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Service"/>
-            </Restriction>
-        </rdfs:subClassOf>
        <rdfs:comment>A Service (Class: Service) is a electronic representation of a Functionality in a network. The Service exposes the Functionality to the network and makes it discoverable, registerable and remotely controllable in the network. 
 A Service is offered by a device that wants (a certain set of) its Functionalities to be discoverable, registerable, remotely controllable by other devices in the network. 
 A Service can expose one or more Functionalities and a Functionality can be exposed by one or more Services.
-The Input- and Output DataPoints and Operations of a Service may have the same names as for a different Service, however the Service to which they belong differentiates how they are addressed in the Device (e.g. via a port specific to the Service).
+The (names of) Input- and Output DataPoints and Operations are only unique within  a Service. The Service to which they belong differentiates how they are addressed in the Device (e.g. via a port specific to the Service).
 NOTE: While a Functionality  describes the – human understandable – meaning of a Service of the device the Service is used to describe how such functionality is represented in a communication network and can be accessed by electronic means. The Service and its Operations is therefore dependent on the technology of the network, hard- and software of the device.</rdfs:comment>
    </Class>
 @@ -1087,12 +1341,6 @@ The simple datatypes and –restrictions contained in &quot;OWL 2 Web Ontology L
 @@ -1087,12 +1341,6 @@ The simple datatypes and –restrictions contained in &quot;OWL 2 Web Ontology L
                <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#ThingProperty"/>
            </Restriction>
        </rdfs:subClassOf>
-        <rdfs:subClassOf>
-            <Restriction>
-                <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasThingRelation"/>
-                <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Thing"/>
-            </Restriction>
-        </rdfs:subClassOf>
        <rdfs:comment>A Thing in oneM2M  (Class: Thing) is an entity that can be identified in the oneM2M System. 
 A Thing that is not a Device is not able to conmmunicate electronically with its environment. However, the sub-class of Thing that is able to interact electronically is called a &quot;Device&quot;.
 A Thing may have ThingProperties (Object Property: hasThingProperty). A Thing can have relations to other things (Object Property: hasThingRelation).
 @@ -1107,10 +1355,10 @@ E.g. A room that is modelled in oneM2M would be a Thing that could have a room-t
 @@ -1107,10 +1355,10 @@ E.g. A room that is modelled in oneM2M would be a Thing that could have a room-t
    <Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#ThingProperty">
        <rdfs:subClassOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable"/>
-        <rdfs:comment>A Value (Class: Value) denotes a property of a Thing. A Value can e.g. be observed or influenced by devices, or it constitutes static data about a Thing.
+        <rdfs:comment>A Variable that quantifies a property of a Thing. A ThingProperty can e.g. be observed or influenced by devices, or it constitutes static data about a Thing.
-E.g. the indoor temperature of the room could be a Value of a Thing &quot;room&quot;.
+E.g. the indoor temperature of the room could be a ThingProperty of a Thing &quot;room&quot;.
-A Value of a thing can concern a certain Aspect, e.g. the indoor temperature concerns the Aspect &quot;Temperature&quot; that could be measured by a temperature sensor.
+A ThingProperty of a Thing can concern a certain Aspect, e.g. the indoor temperature concerns the Aspect &quot;Temperature&quot; that could be measured by a temperature sensor.
-A Value of a Thing can have meta data</rdfs:comment>
+A ThingProperty of a Thing can have meta data</rdfs:comment>
    </Class>
 @@ -1118,12 +1366,6 @@ A Value of a Thing can have meta data</rdfs:comment>
 @@ -1118,12 +1366,6 @@ A Value of a Thing can have meta data</rdfs:comment>
    <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable -->
    <Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable">
-        <rdfs:subClassOf>
-            <Restriction>
-                <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasSubStructure"/>
-                <allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable"/>
-            </Restriction>
-        </rdfs:subClassOf>
        <rdfs:comment>A Variable (Class: Variable) constitutes a super class to the following classes: ThingProperty, OperationInput, OperationOutput, OperationState, InputDataPoint, OutputDataPoint, SimpleTypeVariable. Its members are entities that store some data (e.g. integers, text, or structured data) that can change over time. 
 These data of the Variable usually describe some real-world Aspects (e.g. a temperature) and can have MetaData (e.g. units, precision..)</rdfs:comment>
    </Class>