Commit d739ab33c2c7adb624833ccc0b26a8ec6ff90f06

Authored by Joerg Swetina
2 parents 0657f8dc fa94bec3

Merge branch 'Creating_version_3_5' into 'master'

Version 3.5.0 of the base ontology

Version 3.5.0 of the base ontology

See merge request !8
Showing 1 changed file with 11 additions and 10 deletions
... ... @@ -8,7 +8,7 @@
8 8 xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
9 9 xmlns:BO="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#">
10 10 <Ontology rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology">
11   - <versionIRI rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology-v3_4_0"/>
  11 + <versionIRI rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology-v3_5_0"/>
12 12 <rdfs:comment>This file contains the Base Ontology of oneM2M as specified in TS-0012
13 13  
14 14 =========================================
... ... @@ -98,7 +98,15 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
98 98 <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#exposesCommand -->
99 99  
100 100 <ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#exposesCommand">
101   - <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Operation"/>
  101 + <rdfs:domain>
  102 + <Class>
  103 + <unionOf rdf:parseType="Collection">
  104 + <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#InputDataPoint"/>
  105 + <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Operation"/>
  106 + <rdf:Description rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#OutputDataPoint"/>
  107 + </unionOf>
  108 + </Class>
  109 + </rdfs:domain>
102 110 <rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Command"/>
103 111 <rdfs:comment>A –machine interpretable- Operation or an Input/OutputDataPoint of a Service exposes a –human understandable- Command to a network</rdfs:comment>
104 112 </ObjectProperty>
... ... @@ -263,7 +271,7 @@ the cardinality of hasSubService must be - min 1.&lt;/rdfs:comment&gt;
263 271 <!-- http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasSubStructure -->
264 272  
265 273 <ObjectProperty rdf:about="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasSubStructure">
266   - <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable"/>
  274 + <rdfs:domain rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#StructuredTypeVariable"/>
267 275 <rdfs:range rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable"/>
268 276 <rdfs:comment>A structured Variable can be composed of (sub-)Variables</rdfs:comment>
269 277 </ObjectProperty>
... ... @@ -1004,13 +1012,6 @@ NOTE: While a Functionality describes the – human understandable – meaning
1004 1012 <rdfs:subClassOf rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable"/>
1005 1013 <rdfs:subClassOf>
1006 1014 <Restriction>
1007   - <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasSubStructure"/>
1008   - <qualifiedCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#nonNegativeInteger">0</qualifiedCardinality>
1009   - <onClass rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#Variable"/>
1010   - </Restriction>
1011   - </rdfs:subClassOf>
1012   - <rdfs:subClassOf>
1013   - <Restriction>
1014 1015 <onProperty rdf:resource="http://www.onem2m.org/ontology/Base_Ontology/base_ontology#hasDataRestriction"/>
1015 1016 <allValuesFrom rdf:resource="http://www.w3.org/1999/02/22-rdf-syntax-ns#PlainLiteral"/>
1016 1017 </Restriction>
... ...