diff --git a/base_ontology.owl b/base_ontology.owl
index dd1160067dd1e42e3511fd1869200e9b3bace2b6..6088b4a93168bb0feb6e5cb429f1c54d474f0524 100644
--- a/base_ontology.owl
+++ b/base_ontology.owl
@@ -5,10 +5,10 @@
xmlns:owl="http://www.w3.org/2002/07/owl#"
xmlns:xml="http://www.w3.org/XML/1998/namespace"
xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
- xmlns:base_ontology="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#"
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+ xmlns:BO="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#">
<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_3_0"/>
+ <versionIRI rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology-v3_4_0"/>
<rdfs:comment>This file contains the Base Ontology of oneM2M as specified in TS-0012
=========================================
@@ -165,14 +165,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasInputDataPoint -->
<ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasInputDataPoint">
- <rdfs:domain>
- <Class>
- <unionOf rdf:parseType="Collection">
- <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Operation"/>
- <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Service"/>
- </unionOf>
- </Class>
- </rdfs:domain>
+ <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Service"/>
<rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#InputDataPoint"/>
<rdfs:comment>A Service or an Operation of a Service of the Device can have InputDataPoints. Communicating entities write data into InputDataPoints and the Device retrieves the data at times according to an internal schedule.
- An InputDataPoint is a persistent resource</rdfs:comment>
@@ -213,16 +206,6 @@ the cardinality of hasOperation must be - min 1.</rdfs:comment>
- <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOperationState -->
-
- <ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOperationState">
- <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Operation"/>
- <rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OperationState"/>
- <rdfs:comment>An Operation may have an OperationState that is exposed</rdfs:comment>
- </ObjectProperty>
-
-
-
<!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOutput -->
<ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOutput">
@@ -243,14 +226,7 @@ the cardinality of hasOperation must be - min 1.</rdfs:comment>
<!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOutputDataPoint -->
<ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOutputDataPoint">
- <rdfs:domain>
- <Class>
- <unionOf rdf:parseType="Collection">
- <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Operation"/>
- <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Service"/>
- </unionOf>
- </Class>
- </rdfs:domain>
+ <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Service"/>
<rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OutputDataPoint"/>
<rdfs:comment>A Service or an Operation of a Service of the Device can have OutputDataPoints. The Device writes data into OutputDataPoints at times according to an internal schedule and the communicating entitis retrieves the data.
- An OutputDataPoint is a persistent resource</rdfs:comment>
@@ -357,37 +333,15 @@ The Data Property "hasDataRestriction" shall always be sub-classed</rd
- <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_langRange -->
-
- <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 "de-DE" ) contains the pairs < "abc" , "de-de" > and < "abc" , "de-de-1996" > (because these match the language range "de-DE" according to RFC 4647), but not the string "abc" (because it is not a pair with a language tag) or the pairs < "abc" , "de-deva" > and < "abc" , "de-latn-de" > (because these do not match the language range "de-DE" according to RFC 4647)</rdfs:comment>
- </DatatypeProperty>
-
-
-
<!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_length -->
<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:range rdf:resource="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
<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>
+- xs:string</rdfs:comment>
</DatatypeProperty>
@@ -400,45 +354,15 @@ it applies to:
<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#float"/>
<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>
+- xs:integer
+- xs:float</rdfs:comment>
</DatatypeProperty>
@@ -451,45 +375,15 @@ It applies to:
<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#float"/>
<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>
+- xs:integer
+- xs:float</rdfs:comment>
</DatatypeProperty>
@@ -499,20 +393,10 @@ It applies to:
<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:range rdf:resource="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
<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>
+- xs:string</rdfs:comment>
</DatatypeProperty>
@@ -525,45 +409,15 @@ it applies to:
<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#float"/>
<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>
+- xs:integer
+- xs:float</rdfs:comment>
</DatatypeProperty>
@@ -576,45 +430,15 @@ It applies to:
<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#float"/>
<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>
+- xs:integer
+- xs:float</rdfs:comment>
</DatatypeProperty>
@@ -624,20 +448,10 @@ It applies to:
<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:range rdf:resource="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"/>
<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>
+- xs:string</rdfs:comment>
</DatatypeProperty>
@@ -650,15 +464,7 @@ it applies to:
<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>
+- xs:string</rdfs:comment>
</DatatypeProperty>
@@ -672,146 +478,92 @@ it applies to:
<oneOf>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">owl:rational </rdf:first>
+ <rdf:first>xs:NCName</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">owl:real </rdf:first>
+ <rdf:first>xs:anySimpleType</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">rdf:PlainLiteral</rdf:first>
+ <rdf:first>xs:anyType</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">rdf:XMLLiteral</rdf:first>
+ <rdf:first>xs:anyURI</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:NCName </rdf:first>
+ <rdf:first>xs:base64Binary</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:NMTOKEN </rdf:first>
+ <rdf:first>xs:boolean</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:Name </rdf:first>
+ <rdf:first>xs:dateTime</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:anyURI</rdf:first>
+ <rdf:first>xs:decimal</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:base64Binary </rdf:first>
+ <rdf:first>xs:double</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:boolean</rdf:first>
+ <rdf:first>xs:duration</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:byte </rdf:first>
+ <rdf:first>xs:float</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:dateTime </rdf:first>
+ <rdf:first>xs:hexBinary</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:dateTimeStamp </rdf:first>
+ <rdf:first>xs:integer</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:decimal </rdf:first>
+ <rdf:first>xs:language</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:hexBinary </rdf:first>
+ <rdf:first>xs:nonNegativeInteger</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:int </rdf:first>
+ <rdf:first>xs:normalizedString</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:integer </rdf:first>
+ <rdf:first>xs:positiveInteger</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:language </rdf:first>
+ <rdf:first>xs:string</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:long </rdf:first>
+ <rdf:first>xs:token</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:negativeInteger </rdf:first>
+ <rdf:first>xs:unsignedInt</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:nonNegativeInteger </rdf:first>
+ <rdf:first>xs:unsignedLong</rdf:first>
<rdf:rest>
<rdf:Description>
<rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:nonPositiveInteger </rdf:first>
- <rdf:rest>
- <rdf:Description>
- <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:normalizedString </rdf:first>
- <rdf:rest>
- <rdf:Description>
- <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:positiveInteger </rdf:first>
- <rdf:rest>
- <rdf:Description>
- <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:short </rdf:first>
- <rdf:rest>
- <rdf:Description>
- <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:string </rdf:first>
- <rdf:rest>
- <rdf:Description>
- <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:token </rdf:first>
- <rdf:rest>
- <rdf:Description>
- <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:unsignedByte </rdf:first>
- <rdf:rest>
- <rdf:Description>
- <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:unsignedInt </rdf:first>
- <rdf:rest>
- <rdf:Description>
- <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:unsignedLong </rdf:first>
- <rdf:rest>
- <rdf:Description>
- <rdf:type rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#List"/>
- <rdf:first rdf:datatype="http://www.w3.org/2001/XMLSchema#string">xsd:unsignedShort </rdf:first>
- <rdf:rest rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
- </rdf:Description>
- </rdf:rest>
- </rdf:Description>
- </rdf:rest>
- </rdf:Description>
- </rdf:rest>
- </rdf:Description>
- </rdf:rest>
- </rdf:Description>
- </rdf:rest>
- </rdf:Description>
- </rdf:rest>
- </rdf:Description>
- </rdf:rest>
- </rdf:Description>
- </rdf:rest>
- </rdf:Description>
- </rdf:rest>
+ <rdf:first>xs:unsignedShort</rdf:first>
+ <rdf:rest rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"/>
</rdf:Description>
</rdf:rest>
</rdf:Description>
@@ -886,6 +638,15 @@ E.g. a certain type of Device could have the model (as a numeric description) or
+ <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#isDataList -->
+
+ <DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#isDataList">
+ <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2001/XMLSchema#boolean"/>
+ </DatatypeProperty>
+
+
+
<!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#netTechnologyCommunicationProtocol -->
<DatatypeProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#netTechnologyCommunicationProtocol">
@@ -1144,30 +905,12 @@ E.g. the indoor temperature could have meta data: "Degrees Celsius"</r
<allValuesFrom rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OperationInput"/>
</Restriction>
</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>
- </rdfs:subClassOf>
<rdfs:subClassOf>
<Restriction>
<onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasOutput"/>
<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
@@ -1200,52 +943,6 @@ An Operation correlates the output data of the Operation to the input data that
- <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OperationState -->
-
- <Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OperationState">
- <rdfs:subClassOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
- <rdfs:subClassOf>
- <Class>
- <unionOf rdf:parseType="Collection">
- <Restriction>
- <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_pattern"/>
- <hasValue rdf:datatype="http://www.w3.org/2001/XMLSchema#string">data_received_by_application</hasValue>
- </Restriction>
- <Restriction>
- <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_pattern"/>
- <hasValue rdf:datatype="http://www.w3.org/2001/XMLSchema#string">data_transmitted_to_interworked_device</hasValue>
- </Restriction>
- <Restriction>
- <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_pattern"/>
- <hasValue rdf:datatype="http://www.w3.org/2001/XMLSchema#string">operation_ended</hasValue>
- </Restriction>
- <Restriction>
- <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_pattern"/>
- <hasValue rdf:datatype="http://www.w3.org/2001/XMLSchema#string">operation_failed</hasValue>
- </Restriction>
- </unionOf>
- </Class>
- </rdfs:subClassOf>
- <rdfs:subClassOf>
- <Restriction>
- <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction_pattern"/>
- <qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#nonNegativeInteger">1</qualifiedCardinality>
- <onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </Restriction>
- </rdfs:subClassOf>
- <rdfs:subClassOf>
- <Restriction>
- <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataType"/>
- <qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#nonNegativeInteger">1</qualifiedCardinality>
- <onDataRange rdf:resource="http://www.w3.org/2001/XMLSchema#string"/>
- </Restriction>
- </rdfs:subClassOf>
- <rdfs:comment>describes the current state during the lifetime of an Operation. The OperationState class represents all possible values for that state (enumerated individuals). The OperationState is set during the progress of the operation by the entity invoking the operation, the entity that is the target of the operation, e.g. a device (or for interworked devices by the IPE) and the CSE. It takes values like
-"data_received_by_application", "operation_ended", "operation_failed", "data_transmitted_to_interworked_device".</rdfs:comment>
- </Class>
-
-
-
<!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OutputDataPoint -->
<Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OutputDataPoint">
@@ -1325,9 +1022,26 @@ NOTE: While a Functionality describes the – human understandable – meaning
<onDataRange rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#PlainLiteral"/>
</Restriction>
</rdfs:subClassOf>
- <rdfs:comment>SimpleTypeVariable (Class: SimpleTypeVariable) is a sub-class of class:Variable that only consists of Variables of simple xml types like xsd:integer, xsd:string…, potentially including restrictions
+ <disjointWith rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#StructuredTypeVariable"/>
+ <rdfs:comment>SimpleTypeVariable (Class: SimpleTypeVariable) is a sub-class of class:Variable that only consists of Variables of simple xml types like xsd:integer, xsd:string…, potentially including lists and restrictions
+
+The simple datatypes and –restrictions contained in 'https://www.w3.org/TR/xmlschema11-2' shall be referred to using the prefix: xs</rdfs:comment>
+ </Class>
+
-The simple datatypes and –restrictions contained in "OWL 2 Web Ontology Language Structural Specification and Functional-Style Syntax (Second Edition)" are supported. (see http://www.w3.org/TR/owl2-syntax/)</rdfs:comment>
+
+ <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#StructuredTypeVariable -->
+
+ <Class rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#StructuredTypeVariable">
+ <rdfs:subClassOf rdf:resource="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"/>
+ <minQualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#nonNegativeInteger">1</minQualifiedCardinality>
+ <onClass rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable"/>
+ </Restriction>
+ </rdfs:subClassOf>
+ <rdfs:comment>Structured type variables are variables that are not SimpleType Variables</rdfs:comment>
</Class>
@@ -1366,6 +1080,10 @@ A ThingProperty 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">
+ <disjointUnionOf rdf:parseType="Collection">
+ <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#SimpleTypeVariable"/>
+ <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#StructuredTypeVariable"/>
+ </disjointUnionOf>
<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>