Cleanup of ontologies and their build scripts

diff --git a/Common/C++/SmartAPI/smartapi/agents/SearchAgent.cpp b/Common/C++/SmartAPI/smartapi/agents/SearchAgent.cpp
index 9c6b278c8e9abdc306d1c0c56c6833f2f88099a0..88b31a4041edfd65b79795c7040073b120164588 100644 (file)
--- a/Common/C++/SmartAPI/smartapi/agents/SearchAgent.cpp
+++ b/Common/C++/SmartAPI/smartapi/agents/SearchAgent.cpp
@@ -153,7 +153,7 @@ QList<Entity*> SearchAgent::searchByRegistrant(QString registrantId)
 {
        clear();
 
-       ofRegistrant(registrantId);
+       ofRegistrantId(registrantId);
        return searchSync();
 }
 
@@ -161,7 +161,7 @@ QList<Entity*> SearchAgent::searchByRegistrant(QString registrantId, QString typ
 {
        clear();
 
-       ofRegistrant(registrantId);
+       ofRegistrantId(registrantId);
        ofType(type);
        return searchSync();
 }
@@ -240,7 +240,7 @@ void SearchAgent::ofName(QString searchString, bool exactMatch)
        }
 }
 
-void SearchAgent::ofRegistrant(QString regId)
+void SearchAgent::ofRegistrantId(QString regId)
 {
        mEntity->add(PROPERTY__ISREGISTEREDBY, new Obj(regId));
 }
@@ -257,6 +257,11 @@ void SearchAgent::ofId(QString searchString)
        mEntity->add(PROPERTY__ID, condition);
 }
 
+void SearchAgent::ofServiceId(QString servceId)
+{
+       mEntity->add(PROPERTY__ISSERVEDON, new Obj(servceId));
+}
+
 void SearchAgent::ofIds(QStringList searchStrings)
 {
        for (int i = 0; i < searchStrings.length(); i++) {
@@ -321,6 +326,51 @@ void SearchAgent::anyOfTypes(QStringList types)
        }
 }
 
+
+void SearchAgent::ofTopic(QString searchString, bool exactMatch)
+{
+       if (exactMatch) {
+               mEntity->add(PROPERTY__TOPIC, searchString);
+       } else {
+               Condition* condition = new Condition();
+               condition->addRegex("(?i)" + searchString);
+               mEntity->add(PROPERTY__TOPIC, condition);
+       }
+}
+
+void SearchAgent::ofTheme(QString searchString, bool exactMatch)
+{
+       if (exactMatch) {
+               mEntity->add(PROPERTY__TOPIC, searchString);
+       } else {
+               Condition* condition = new Condition();
+               condition->addRegex("(?i)" + searchString);
+               mEntity->add(PROPERTY__TOPIC, condition);
+       }
+}
+
+void SearchAgent::ofLocality(QString searchString, bool exactMatch)
+{
+       if (exactMatch) {
+               mEntity->add(PROPERTY__LOCALITY, searchString);
+       } else {
+               Condition* condition = new Condition();
+               condition->addRegex("(?i)" + searchString);
+               mEntity->add(PROPERTY__LOCALITY, condition);
+       }
+}
+
+void SearchAgent::ofCountry(QString searchString, bool exactMatch)
+{
+       if (exactMatch) {
+               mEntity->add(PROPERTY__COUNTRY_NAME, searchString);
+       } else {
+               Condition* condition = new Condition();
+               condition->addRegex("(?i)" + searchString);
+               mEntity->add(PROPERTY__COUNTRY_NAME, condition);
+       }
+}
+
 void SearchAgent::minutesOldData(int minutes)
 {
        mEntity->add(PROPERTY__FRESHNESS, new Variant(new Duration(0, 0, 0, 0, minutes, 0)));

diff --git a/Common/C++/SmartAPI/smartapi/agents/SearchAgent.h b/Common/C++/SmartAPI/smartapi/agents/SearchAgent.h
index 12dd1bf9e04910192b4b139a71aa1b69a0712639..4e1ea048107f3c778b56489367608cf38053d143 100644 (file)
--- a/Common/C++/SmartAPI/smartapi/agents/SearchAgent.h
+++ b/Common/C++/SmartAPI/smartapi/agents/SearchAgent.h
@@ -40,14 +40,20 @@ public:
        void clear();
        void clear(QString entityUri);
 
-       void ofRegistrant(QString regId);
-       void ofName(QString searchString, bool exactMatch = false);
-       void ofType(QString type);
        void ofId(QString searchString);
        void ofIds(QStringList searchStrings);
+       void ofServiceId(QString searchString);
+       void ofRegistrantId(QString registrantId);
+       void ofName(QString searchString, bool exactMatch = false);
+       void ofType(QString type);
        void ofDescription(QString searchString);
        void ofOutputCategory(QString category);
        void ofInputCategory(QString category);
+       void ofTopic(QString searchString, bool exactMatch = false);
+       void ofTheme(QString searchString, bool exactMatch = false);
+       void ofLocality(QString searchString, bool exactMatch = false);
+       void ofCountry(QString searchString, bool exactMatch = false);
+
        void anyOfNames(QStringList searchStrings);
        void anyOfTypes(QStringList types);
        void minutesOldData(int minutes);

diff --git a/Ontology/build-1.0.sh b/Ontology/build-1.0.sh
index 0c4423fbb13500252cb3bfa11e5eda9e768907fd..665d4606e8df2a6a12d58e079075191eb298245d 100755 (executable)
--- a/Ontology/build-1.0.sh
+++ b/Ontology/build-1.0.sh
@@ -1,5 +1,5 @@
-echo " *** Combining vocabularies into smartapi.ttl *** "
+echo " *** Combining vocabularies into smartapi_merged-1.0.ttl *** "
 
-cat src/1.0/smartapi-1.0_base.ttl src/1.0/CommonStructureOntology-1.0.ttl  src/1.0/DataOntology-1.0.ttl src/1.0/EntityOntology-1.0.ttl src/1.0/IndividualsOntology-1.0.ttl src/1.0/NetworkingOntology-1.0.ttl src/1.0/QuantityUnitOntology-1.0.ttl  > smartapi-1.0.ttl
+cat src/1.0/AbstractEntityOntology-1.0.ttl src/1.0/CommonStructureOntology-1.0.ttl src/1.0/DataOntology-1.0.ttl src/1.0/EntityOntology-1.0.ttl src/1.0/EnvironmentOntology-1.1.ttl src/1.0/IndividualsOntology-1.0.ttl src/1.0/NetworkingOntology-1.0.ttl src/1.0/PhysicalEntityOntology-1.1.ttl src/1.0/SecurityOntology-1.0.ttl src/1.0/TradingOntology-1.0.ttl src/1.0/QuantityUnitOntology-1.0.ttl  > smartapi_merged-1.0.ttl
 
 echo " *** Done *** "

diff --git a/Ontology/src/1.0/AbstractEntityOntology-1.0.ttl b/Ontology/src/1.0/AbstractEntityOntology-1.0.ttl
index f68a9ac7487686c3784eebfe30f8583b4933f3d8..a7a757651aacf55d2f4c30b62188e16ac1bb77b3 100644 (file)
--- a/Ontology/src/1.0/AbstractEntityOntology-1.0.ttl
+++ b/Ontology/src/1.0/AbstractEntityOntology-1.0.ttl
@@ -13,21 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . #Resource data framework
-@prefix owl: <http://www.w3.org/2002/07/owl#> .              #Owl ontology language
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .      #RDF schema
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .           #XML standard datatypes
-@prefix dc: <http://purl.org/dc/terms/> .     #Dublin Core Metadata Initiative terms
-@prefix vann: <http://purl.org/vocab/vann/> .  #A vocabulary for annotating vocabulary descriptions
-@prefix voaf: <http://purl.org/vocommons/voaf#> . #A vocabulary of a friend, for describing relations between linked vocabularies
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .  #Resource data framework
+@prefix owl: <http://www.w3.org/2002/07/owl#> .               #Owl ontology language
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .       #RDF schema
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .            #XML standard datatypes
+@prefix dc: <http://purl.org/dc/terms/> .                     #Dublin Core Metadata Initiative terms
+@prefix vann: <http://purl.org/vocab/vann/> .                 #A vocabulary for annotating vocabulary descriptions
+@prefix voaf: <http://purl.org/vocommons/voaf#> .             #A vocabulary of a friend, for describing relations between linked vocabularies
 @prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> . #Semantic web vocabulary status ontology
 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
-@prefix saref: <https://w3id.org/saref#>. #SAREF smart building appliances ontology
-@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> . #QUDT
+@prefix saref: <https://w3id.org/saref#>.                     #SAREF smart building appliances ontology
+@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> .         #QUDT
 @prefix vcard: <http://www.w3.org/2006/vcard/ns#> .
 
-@prefix smartapi: <http://www.smart-api.io/ontology/1.0/>.
-@base <http://www.smart-api.io/ontology/1.0/>.
+@prefix smartapi: <http://smart-api.io/ontology/1.0/smartapi#>.
+@base <http://smart-api.io/ontology/1.0/>.
 
 
 # smartapi entities that represent abstract objects
@@ -46,8 +46,8 @@ smartapi:AbstractEntityOntology a owl:Ontology , voaf:Ontology ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0/> ;
-  owl:versionIRI <http://www.smart-api.io/ontology/1.0/AbstractEntityOntology/1.0> ;
+  vann:preferredNamespaceUri <http://smart-api.io/ontology/1.0/smartapi#> ;
+  owl:versionIRI <http://smart-api.io/ontology/1.0/AbstractEntityOntology> ;
   owl:versionInfo "v1.0" .
 
 

diff --git a/Ontology/src/1.0/CommonStructureOntology-1.0.ttl b/Ontology/src/1.0/CommonStructureOntology-1.0.ttl
index 8b6e6e7ee575846378a8d2a853a549a3c9df2999..767afd0e5b5a83bd48254b90135bf7d6f8893186 100644 (file)
--- a/Ontology/src/1.0/CommonStructureOntology-1.0.ttl
+++ b/Ontology/src/1.0/CommonStructureOntology-1.0.ttl
@@ -13,20 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . #Resource data framework
-@prefix owl: <http://www.w3.org/2002/07/owl#> .              #Owl ontology language
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .      #RDF schema
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .           #XML standard datatypes
-@prefix dc: <http://purl.org/dc/terms/> .     #Dublin Core Metadata Initiative terms
-@prefix vann: <http://purl.org/vocab/vann/> .  #A vocabulary for annotating vocabulary descriptions
-@prefix voaf: <http://purl.org/vocommons/voaf#> . #A vocabulary of a friend, for describing relations between linked vocabularies
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .  #Resource data framework
+@prefix owl: <http://www.w3.org/2002/07/owl#> .               #Owl ontology language
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .       #RDF schema
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .            #XML standard datatypes
+@prefix dc: <http://purl.org/dc/terms/> .                     #Dublin Core Metadata Initiative terms
+@prefix vann: <http://purl.org/vocab/vann/> .                 #A vocabulary for annotating vocabulary descriptions
+@prefix voaf: <http://purl.org/vocommons/voaf#> .             #A vocabulary of a friend, for describing relations between linked vocabularies
 @prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> . #Semantic web vocabulary status ontology
 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
 @prefix geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>.
 @prefix gr: <http://purl.org/goodrelations/v1#> .
 
-@prefix smartapi: <https://www.smart-api.io/ontology/1.0/>.
-@base <https://www.smart-api.io/ontology/1.0/>.
+@prefix smartapi: <http://smart-api.io/ontology/1.0/smartapi#>.
+@base <http://smart-api.io/ontology/1.0/>.
 
 
 #all standard smartapi quantities and units
@@ -45,8 +45,8 @@ smartapi:CommonStructureOntology a owl:Ontology , voaf:Ontology ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0/> ;
-  owl:versionIRI <http://www.smart-api.io/ontology/1.0/CommonStructureOntology/1.0> ;
+  vann:preferredNamespaceUri <http://smart-api.io/ontology/1.0/smartapi#> ;
+  owl:versionIRI <http://smart-api.io/ontology/1.0/CommonStructureOntology> ;
   owl:versionInfo "v1.0" .
 
 # object
@@ -457,13 +457,6 @@ smartapi:contentType a owl:DatatypeProperty;
   rdfs:range xsd:string ;
   vs:term_status "testing" .
 
-smartapi:topic a owl:DatatypeProperty ;
-  rdfs:label "Topic"@en ;
-  rdfs:comment "An MQTT  topic."@en ;
-  rdfs:isDefinedBy smartapi:CommonStructureOntology ;
-  rdfs:range xsd:string ;
-  vs:term_status "testing" .
-
 # ability, availability, controllability, validity
 
 smartapi:Ability a owl:Class ;

diff --git a/Ontology/src/1.0/DataOntology-1.0.ttl b/Ontology/src/1.0/DataOntology-1.0.ttl
index 8b56305613fc093edd2d5721cc25d1c57ffb6afe..0e5a7a37828a99907f70a689290fbe30c3c66d7b 100644 (file)
--- a/Ontology/src/1.0/DataOntology-1.0.ttl
+++ b/Ontology/src/1.0/DataOntology-1.0.ttl
@@ -13,20 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . #Resource data framework
-@prefix owl: <http://www.w3.org/2002/07/owl#> .              #Owl ontology language
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .      #RDF schema
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .           #XML standard datatypes
-@prefix dc: <http://purl.org/dc/terms/> .     #Dublin Core Metadata Initiative terms
-@prefix vann: <http://purl.org/vocab/vann/> .  #A vocabulary for annotating vocabulary descriptions
-@prefix voaf: <http://purl.org/vocommons/voaf#> . #A vocabulary of a friend, for describing relations between linked vocabularies
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .  #Resource data framework
+@prefix owl: <http://www.w3.org/2002/07/owl#> .               #Owl ontology language
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .       #RDF schema
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .            #XML standard datatypes
+@prefix dc: <http://purl.org/dc/terms/> .                     #Dublin Core Metadata Initiative terms
+@prefix vann: <http://purl.org/vocab/vann/> .                 #A vocabulary for annotating vocabulary descriptions
+@prefix voaf: <http://purl.org/vocommons/voaf#> .             #A vocabulary of a friend, for describing relations between linked vocabularies
 @prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> . #Semantic web vocabulary status ontology
 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
 @prefix gr: <http://purl.org/goodrelations/v1#> .
-@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> . #QUDT
+@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> .         #QUDT
 
-@prefix smartapi: <http://www.smart-api.io/ontology/1.0/>.
-@base <http://www.smart-api.io/ontology/1.0/>.
+@prefix smartapi: <http://smart-api.io/ontology/1.0/smartapi#>.
+@base <http://smart-api.io/ontology/1.0/>.
 
 
 #all standard smartapi quantities and units
@@ -45,8 +45,8 @@ smartapi:DataOntology a owl:Ontology , voaf:Ontology ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0> ;
-  owl:versionIRI <http://www.smart-api.io/ontology/DataOntology/1.0> ;
+  vann:preferredNamespaceUri <http://smart-api.io/ontology/1.0/smartapi#> ;
+  owl:versionIRI <http://smart-api.io/ontology/DataOntology> ;
   owl:versionInfo "v1.0" .
 
 # value object
@@ -234,6 +234,23 @@ smartapi:step a owl:DatatypeProperty ;
   rdfs:subPropertyOf smartapi:value ;
   rdfs:domain smartapi:ValueObject .
 
+# classification by theme and topic
+
+smartapi:topic a owl:DatatypeProperty ;
+  rdfs:label "Topic"@en ;
+  rdfs:comment "A topic for the data that is being processed. May also be used as a technical classifier (e.g. in MQTT protocol)"@en ;
+  rdfs:isDefinedBy smartapi:DataOntology ;
+  rdfs:range xsd:string ;
+  vs:term_status "testing" .
+  
+smartapi:theme a owl:DatatypeProperty ;
+  rdfs:label "Theme"@en ;
+  rdfs:comment "The theme of the data that is being processed."@en ;
+  rdfs:isDefinedBy smartapi:DataOntology ;
+  rdfs:range xsd:string ;
+  vs:term_status "testing" .
+
+
 # temporal concepts
 
 smartapi:TemporalEntity a owl:Class ;
@@ -328,6 +345,7 @@ smartapi:paidUntil a owl:ObjectProperty ;
   rdfs:isDefinedBy smartapi:DataOntology ;
   vs:term_status "testing" .
 
+
 # capacity
   
 smartapi:Capacity a owl:Class ;
@@ -356,6 +374,7 @@ smartapi:percentage a owl:DatatypeProperty ;
   rdfs:range rdf:XMLLiteral ;
   rdfs:isDefinedBy smartapi:DataOntology .
 
+
 # valueobject subclass properties
 
 smartapi:price a owl:ObjectProperty ;
@@ -365,6 +384,7 @@ smartapi:price a owl:ObjectProperty ;
   rdfs:subPropertyOf smartapi:valueObject ;
   rdfs:isDefinedBy smartapi:DataOntology .
 
+
 # hasChanged and checksum
 
 smartapi:checksum a owl:DatatypeProperty ;
@@ -398,6 +418,7 @@ smartapi:spread a owl:ObjectProperty ;
   rdfs:domain smartapi:Evaluation ;
   rdfs:range smartapi:Distribution .
 
+
 # category object property (values are in the individuals ontology)
 
 smartapi:category a owl:ObjectProperty ;
@@ -408,6 +429,7 @@ smartapi:category a owl:ObjectProperty ;
   rdfs:range smartapi:Category;
   vs:term_status "testing".
 
+
 # output values
 
 smartapi:outputValues a owl:ObjectProperty ;
@@ -418,6 +440,7 @@ smartapi:outputValues a owl:ObjectProperty ;
   rdfs:range smartapi:ValueObject;
   vs:term_status "testing".
 
+
 # restriction
 
 smartapi:Restriction a owl:Class ;
@@ -434,6 +457,7 @@ smartapi:restriction a owl:ObjectProperty ;
   rdfs:range owl:Restriction ;
   vs:term_status "testing".
 
+
 # optional
 
 smartapi:optional a owl:DatatypeProperty ;
@@ -459,6 +483,7 @@ smartapi:counterPartyUri a owl:ObjectProperty ;
   rdfs:isDefinedBy smartapi:DataOntology ;
   vs:term_status "testing" .
 
+
 # calculation methods
 
 smartapi:calculationMethod a owl:ObjectProperty ;
@@ -503,6 +528,7 @@ smartapi:multiplier a owl:DatatypeProperty ;
   rdfs:isDefinedBy smartapi:DataOntology ;
   vs:term_status "testing" .
 
+
 # default
 
 smartapi:Default a owl:Class ;
@@ -511,6 +537,7 @@ smartapi:Default a owl:Class ;
   rdfs:isDefinedBy smartapi:DataOntology ;
   vs:term_status "testing".
 
+
 # misc data properties
 
 smartapi:energyConsumption a owl:ObjectProperty ;
@@ -527,6 +554,7 @@ smartapi:systemState a owl:ObjectProperty ;
   vs:term_status "testing" ;
   rdfs:isDefinedBy smartapi:DataOntology.
 
+
 # one dimensional length
 
 smartapi:length a owl:DatatypeProperty ;

diff --git a/Ontology/src/1.0/EntityOntology-1.0.ttl b/Ontology/src/1.0/EntityOntology-1.0.ttl
index a5e1d2d7b145a59d094c4a5bb19746c1e67c516f..2809968c498a5c21d0be0c19db546782dbc73f3e 100644 (file)
--- a/Ontology/src/1.0/EntityOntology-1.0.ttl
+++ b/Ontology/src/1.0/EntityOntology-1.0.ttl
@@ -13,21 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . #Resource data framework
-@prefix owl: <http://www.w3.org/2002/07/owl#> .              #Owl ontology language
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .      #RDF schema
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .           #XML standard datatypes
-@prefix dc: <http://purl.org/dc/terms/> .     #Dublin Core Metadata Initiative terms
-@prefix vann: <http://purl.org/vocab/vann/> .  #A vocabulary for annotating vocabulary descriptions
-@prefix voaf: <http://purl.org/vocommons/voaf#> . #A vocabulary of a friend, for describing relations between linked vocabularies
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .  #Resource data framework
+@prefix owl: <http://www.w3.org/2002/07/owl#> .               #Owl ontology language
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .       #RDF schema
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .            #XML standard datatypes
+@prefix dc: <http://purl.org/dc/terms/> .                     #Dublin Core Metadata Initiative terms
+@prefix vann: <http://purl.org/vocab/vann/> .                 #A vocabulary for annotating vocabulary descriptions
+@prefix voaf: <http://purl.org/vocommons/voaf#> .             #A vocabulary of a friend, for describing relations between linked vocabularies
 @prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> . #Semantic web vocabulary status ontology
 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
-@prefix saref: <https://w3id.org/saref#>. #SAREF smart building appliances ontology
-@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> . #QUDT
+@prefix saref: <https://w3id.org/saref#>.                     #SAREF smart building appliances ontology
+@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> .         #QUDT
 @prefix vcard: <http://www.w3.org/2006/vcard/ns#> .
 
-@prefix smartapi: <http://www.smart-api.io/ontology/1.0/>.
-@base <http://www.smart-api.io/ontology/1.0/>.
+@prefix smartapi: <http://smart-api.io/ontology/1.0/smartapi#>.
+@base <http://smart-api.io/ontology/1.0/>.
 
 
 #all standard smartapi entities
@@ -46,8 +46,8 @@ smartapi:EntityOntology a owl:Ontology , voaf:Ontology ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0/> ;
-  owl:versionIRI <http://www.smart-api.io/ontology/1.0/EntityOntology/1.0> ;
+  vann:preferredNamespaceUri <http://smart-api.io/ontology/1.0/smartapi#> ;
+  owl:versionIRI <http://smart-api.io/ontology/1.0/EntityOntology> ;
   owl:versionInfo "v1.0" .
 
 # entity
@@ -209,6 +209,13 @@ smartapi:hasInfluenceOn rdf:type owl:ObjectProperty ;
   rdfs:range smartapi:Entity ;
   rdfs:isDefinedBy smartapi:EntityOntology .
 
+smartapi:isInfluencedBy rdf:type owl:ObjectProperty ;
+  rdfs:label "Is influenced by"@en ;
+  rdfs:comment "Indicate this resource is influenced by the target resource."@en ;
+  rdfs:range smartapi:Entity ;
+  rdfs:domain smartapi:Entity ;
+  rdfs:isDefinedBy smartapi:EntityOntology .
+  
 smartapi:isComposedBy rdf:type owl:ObjectProperty ;
   rdfs:label "Is composed by"@en ;
   rdfs:comment "This resource is composed by the target resource."@en ;
@@ -223,25 +230,26 @@ smartapi:isContainedIn rdf:type owl:ObjectProperty ;
   rdfs:domain smartapi:Entity ;
   rdfs:isDefinedBy smartapi:EntityOntology .
 
-smartapi:isInfluencedBy rdf:type owl:ObjectProperty ;
-  rdfs:label "Is influenced by"@en ;
-  rdfs:comment "Indicate this resource is influenced by the target resource."@en ;
-  rdfs:range smartapi:Entity ;
-  rdfs:domain smartapi:Entity ;
-  rdfs:isDefinedBy smartapi:EntityOntology .
-
 smartapi:isControlledBy a owl:ObjectProperty;
   rdfs:label "Is controlled by"@en ;
   rdfs:comment "Indicates what resource controls what resource."@en ;
-  rdfs:isDefinedBy smartapi:CommonStructureOntology ;
+  rdfs:isDefinedBy smartapi:EntityOntology ;
   rdfs:range smartapi:Entity ;
   rdfs:domain smartapi:Entity ;
   vs:term_status "testing" .
 
+smartapi:controls a owl:ObjectProperty;
+  rdfs:label "Controls"@en ;
+  rdfs:comment "Indicates what resource is controlling what resource."@en ;
+  rdfs:isDefinedBy smartapi:EntityOntology ;
+  rdfs:range smartapi:Entity ;
+  rdfs:domain smartapi:Entity ;
+  vs:term_status "testing" .
+  
 smartapi:isManagedBy a owl:ObjectProperty;
   rdfs:label "Is managed by"@en ;
   rdfs:comment "Indicates what resource manages what resource."@en ;
-  rdfs:isDefinedBy smartapi:CommonStructureOntology ;
+  rdfs:isDefinedBy smartapi:EntityOntology ;
   rdfs:range smartapi:Entity ;
   rdfs:domain smartapi:Entity ;
   vs:term_status "testing" .
@@ -249,11 +257,27 @@ smartapi:isManagedBy a owl:ObjectProperty;
 smartapi:manages a owl:ObjectProperty;
   rdfs:label "Manages"@en ;
   rdfs:comment "Indicates what resource is managing what resource."@en ;
-  rdfs:isDefinedBy smartapi:CommonStructureOntology ;
+  rdfs:isDefinedBy smartapi:EntityOntology ;
   rdfs:range smartapi:Entity ;
   rdfs:domain smartapi:Entity ;
   vs:term_status "testing" .
 
+smartapi:isServedBy a owl:ObjectProperty;
+  rdfs:label "Is managed by"@en ;
+  rdfs:comment "Indicates a resource such as a dataset is served by another entity."@en ;
+  rdfs:isDefinedBy smartapi:CommonStructOntology ;
+  rdfs:range smartapi:Entity ;
+  rdfs:domain smartapi:Entity ;
+  vs:term_status "testing" .
+  
+smartapi:serves a owl:ObjectProperty;
+  rdfs:label "Serves"@en ;
+  rdfs:comment "Indicates what resource is serving what resource, for example a given service serves a dataset."@en ;
+  rdfs:isDefinedBy smartapi:EntityOntology ;
+  rdfs:range smartapi:Entity ;
+  rdfs:domain smartapi:Entity ;
+  vs:term_status "testing" .
+  
 smartapi:hasPart a owl:ObjectProperty, owl:TransitiveProperty;
   rdfs:label "Has part"@en ;
   rdfs:comment "Indicate this resource has part of other resource."@en ;

diff --git a/Ontology/src/1.0/EnvironmentOntology-1.1.ttl b/Ontology/src/1.0/EnvironmentOntology-1.1.ttl
index dc36a59a704122bf52ffaa83a74e42d3309f23a5..685e13bf8307f2754894a3f0b10ccb8f94eb1c43 100644 (file)
--- a/Ontology/src/1.0/EnvironmentOntology-1.1.ttl
+++ b/Ontology/src/1.0/EnvironmentOntology-1.1.ttl
@@ -13,21 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . #Resource data framework
-@prefix owl: <http://www.w3.org/2002/07/owl#> .              #Owl ontology language
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .      #RDF schema
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .           #XML standard datatypes
-@prefix dc: <http://purl.org/dc/terms/> .     #Dublin Core Metadata Initiative terms
-@prefix vann: <http://purl.org/vocab/vann/> .  #A vocabulary for annotating vocabulary descriptions
-@prefix voaf: <http://purl.org/vocommons/voaf#> . #A vocabulary of a friend, for describing relations between linked vocabularies
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .  #Resource data framework
+@prefix owl: <http://www.w3.org/2002/07/owl#> .               #Owl ontology language
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .       #RDF schema
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .            #XML standard datatypes
+@prefix dc: <http://purl.org/dc/terms/> .                     #Dublin Core Metadata Initiative terms
+@prefix vann: <http://purl.org/vocab/vann/> .                 #A vocabulary for annotating vocabulary descriptions
+@prefix voaf: <http://purl.org/vocommons/voaf#> .             #A vocabulary of a friend, for describing relations between linked vocabularies
 @prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> . #Semantic web vocabulary status ontology
 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
-@prefix saref: <https://w3id.org/saref#>. #SAREF smart building appliances ontology
-@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> . #QUDT
+@prefix saref: <https://w3id.org/saref#>.                     #SAREF smart building appliances ontology
+@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> .         #QUDT
 @prefix vcard: <http://www.w3.org/2006/vcard/ns#> .
 
-@prefix smartapi: <http://www.smart-api.io/ontology/1.0/>.
-@base <http://www.smart-api.io/ontology/1.0/>.
+@prefix smartapi: <http://smart-api.io/ontology/1.0/smartapi#>.
+@base <http://smart-api.io/ontology/1.0/>.
 
 
 # smartapi entities related to physcal environment
@@ -46,8 +46,8 @@ smartapi:EnvironmentOntology a owl:Ontology , voaf:Ontology ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0/> ;
-  owl:versionIRI <http://www.smart-api.io/ontology/1.0/EnvironmentOntology/1.0> ;
+  vann:preferredNamespaceUri <http://smart-api.io/ontology/1.0/smartapi#> ;
+  owl:versionIRI <http://smart-api.io/ontology/1.0/EnvironmentOntology> ;
   owl:versionInfo "v1.0" .
 
     

diff --git a/Ontology/src/1.0/IndividualsOntology-1.0.ttl b/Ontology/src/1.0/IndividualsOntology-1.0.ttl
index e4085de51d737a28b24fe3ef7b3546f1fe695933..69ffbf90c3f843b0ce8ef382f590638e418cd27f 100644 (file)
--- a/Ontology/src/1.0/IndividualsOntology-1.0.ttl
+++ b/Ontology/src/1.0/IndividualsOntology-1.0.ttl
@@ -13,19 +13,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . #Resource data framework
-@prefix owl: <http://www.w3.org/2002/07/owl#> .              #Owl ontology language
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .      #RDF schema
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .           #XML standard datatypes
-@prefix dc: <http://purl.org/dc/terms/> .     #Dublin Core Metadata Initiative terms
-@prefix vann: <http://purl.org/vocab/vann/> .  #A vocabulary for annotating vocabulary descriptions
-@prefix voaf: <http://purl.org/vocommons/voaf#> . #A vocabulary of a friend, for describing relations between linked vocabularies
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .  #Resource data framework
+@prefix owl: <http://www.w3.org/2002/07/owl#> .               #Owl ontology language
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .       #RDF schema
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .            #XML standard datatypes
+@prefix dc: <http://purl.org/dc/terms/> .                     #Dublin Core Metadata Initiative terms
+@prefix vann: <http://purl.org/vocab/vann/> .                 #A vocabulary for annotating vocabulary descriptions
+@prefix voaf: <http://purl.org/vocommons/voaf#> .             #A vocabulary of a friend, for describing relations between linked vocabularies
 @prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> . #Semantic web vocabulary status ontology
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix gr: <http://purl.org/goodrelations/v1#> .
 
-@prefix smartapi: <http://www.smart-api.io/ontology/1.0/>.
-@base <http://www.smart-api.io/ontology/1.0/>.
+@prefix smartapi: <http://smart-api.io/ontology/1.0/smartapi#>.
+@base <http://smart-api.io/ontology/1.0/>.
 
 
 #all standard smartapi quantities and units
@@ -43,8 +43,8 @@ smartapi:IndividualsOntology a owl:Ontology , voaf:Ontology ;
   dc:contributor [a foaf:Person ; foaf:name "Hannu Järvinen" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0/> ;
-  owl:versionIRI <http://www.smart-api.io/ontology/1.0/IndividualsOntology/1.0> ;
+  vann:preferredNamespaceUri <http://smart-api.io/ontology/1.0/smartapi#> ;
+  owl:versionIRI <http://smart-api.io/ontology/1.0/IndividualsOntology> ;
   owl:versionInfo "v1.0" .
 
 

diff --git a/Ontology/src/1.0/NetworkingOntology-1.0.ttl b/Ontology/src/1.0/NetworkingOntology-1.0.ttl
index 198596601836e1a4906de6d2a90d16c3f147330b..909b06870639f1d5385cd5798d5138e423a651a9 100644 (file)
--- a/Ontology/src/1.0/NetworkingOntology-1.0.ttl
+++ b/Ontology/src/1.0/NetworkingOntology-1.0.ttl
@@ -13,18 +13,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . #Resource data framework
-@prefix owl: <http://www.w3.org/2002/07/owl#> .              #Owl ontology language
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .      #RDF schema
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .           #XML standard datatypes
-@prefix dc: <http://purl.org/dc/terms/> .     #Dublin Core Metadata Initiative terms
-@prefix vann: <http://purl.org/vocab/vann/> .  #A vocabulary for annotating vocabulary descriptions
-@prefix voaf: <http://purl.org/vocommons/voaf#> . #A vocabulary of a friend, for describing relations between linked vocabularies
-@prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> . #Semantic web vocabulary status ontology
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .      #Resource data framework
+@prefix owl: <http://www.w3.org/2002/07/owl#> .                   #Owl ontology language
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .           #RDF schema
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .                #XML standard datatypes
+@prefix dc: <http://purl.org/dc/terms/> .                         #Dublin Core Metadata Initiative terms
+@prefix vann: <http://purl.org/vocab/vann/> .                     #A vocabulary for annotating vocabulary descriptions
+@prefix voaf: <http://purl.org/vocommons/voaf#> .                 #A vocabulary of a friend, for describing relations between linked vocabularies
+@prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> .     #Semantic web vocabulary status ontology
 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
 
-@prefix smartapi: <http://www.smart-api.io/ontology/1.0/>.
-@base <http://www.smart-api.io/ontology/1.0/>.
+@prefix smartapi: <http://smart-api.io/ontology/1.0/smartapi#>.
+@base <http://smart-api.io/ontology/1.0/>.
 
 
 # standard smartapi definitions needed for network communication
@@ -35,16 +35,13 @@ smartapi:NetworkingOntology a owl:Ontology , voaf:Ontology ;
   dc:modified "2016-10-06"^^xsd:date ;
   dc:creator [a foaf:Person ; foaf:name "Hannu Järvinen" ] ;
   dc:creator [a foaf:Person ; foaf:name "Jani Hursti" ] ;
-  dc:contributor <http://www.vtt.fi/JarmoKalaoja> ;
-  dc:contributor <http://www.maxime-lefrancois.info/me#> ;
-  dc:contributor <http://zimmer.aprilfoolsreview.com/antoine#me> ;
   dc:contributor [a foaf:Person ; foaf:name "Erkki Siira" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Takoua Ghariani" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Marc Girod-Genet" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0/> ;
-  owl:versionIRI <http://www.smart-api.io/ontology/1.0/NetworkingOntology/1.0> ;
+  vann:preferredNamespaceUri <http://smart-api.io/ontology/1.0/smartapi#> ;
+  owl:versionIRI <http://smart-api.io/ontology/1.0/NetworkingOntology> ;
   owl:versionInfo "v1.0" .
 
 # message

diff --git a/Ontology/src/1.0/PhysicalEntityOntology-1.1.ttl b/Ontology/src/1.0/PhysicalEntityOntology-1.1.ttl
index 0258760c2f3920cb02125d5aa2054440a5b519f8..832a9a97f654890c5d4b9d5a8a2361c098637626 100644 (file)
--- a/Ontology/src/1.0/PhysicalEntityOntology-1.1.ttl
+++ b/Ontology/src/1.0/PhysicalEntityOntology-1.1.ttl
@@ -13,21 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . #Resource data framework
-@prefix owl: <http://www.w3.org/2002/07/owl#> .              #Owl ontology language
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .      #RDF schema
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .           #XML standard datatypes
-@prefix dc: <http://purl.org/dc/terms/> .     #Dublin Core Metadata Initiative terms
-@prefix vann: <http://purl.org/vocab/vann/> .  #A vocabulary for annotating vocabulary descriptions
-@prefix voaf: <http://purl.org/vocommons/voaf#> . #A vocabulary of a friend, for describing relations between linked vocabularies
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .  #Resource data framework
+@prefix owl: <http://www.w3.org/2002/07/owl#> .               #Owl ontology language
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .       #RDF schema
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .            #XML standard datatypes
+@prefix dc: <http://purl.org/dc/terms/> .                     #Dublin Core Metadata Initiative terms
+@prefix vann: <http://purl.org/vocab/vann/> .                 #A vocabulary for annotating vocabulary descriptions
+@prefix voaf: <http://purl.org/vocommons/voaf#> .             #A vocabulary of a friend, for describing relations between linked vocabularies
 @prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> . #Semantic web vocabulary status ontology
 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
-@prefix saref: <https://w3id.org/saref#>. #SAREF smart building appliances ontology
-@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> . #QUDT
+@prefix saref: <https://w3id.org/saref#>.                     #SAREF smart building appliances ontology
+@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> .         #QUDT
 @prefix vcard: <http://www.w3.org/2006/vcard/ns#> .
 
-@prefix smartapi: <http://www.smart-api.io/ontology/1.0/>.
-@base <http://www.smart-api.io/ontology/1.0/>.
+@prefix smartapi: <http://smart-api.io/ontology/1.0/smartapi#>.
+@base <http://smart-api.io/ontology/1.0/>.
 
 
 # smartapi entities that represent physical objects
@@ -46,8 +46,8 @@ smartapi:PhysicalEntityOntology a owl:Ontology , voaf:Ontology ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0/> ;
-  owl:versionIRI <http://www.smart-api.io/ontology/1.0/PhysicalEntityOntology/1.0> ;
+  vann:preferredNamespaceUri <http://smart-api.io/ontology/1.0/smartapi#> ;
+  owl:versionIRI <http://smart-api.io/ontology/1.0/PhysicalEntityOntology> ;
   owl:versionInfo "v1.0" .
 
 

diff --git a/Ontology/src/1.0/QuantityUnitOntology-1.0.ttl b/Ontology/src/1.0/QuantityUnitOntology-1.0.ttl
index 4b0a8fea8cfce8f4e5b9ed8dc94b1031d6f832c9..c1560436686ee07abd4297c853fc87634ec38180 100644 (file)
--- a/Ontology/src/1.0/QuantityUnitOntology-1.0.ttl
+++ b/Ontology/src/1.0/QuantityUnitOntology-1.0.ttl
@@ -13,22 +13,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . #Resource data framework
-@prefix owl: <http://www.w3.org/2002/07/owl#> .              #Owl ontology language
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .      #RDF schema
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .           #XML standard datatypes
-@prefix dc: <http://purl.org/dc/terms/> .     #Dublin Core Metadata Initiative terms
-@prefix vann: <http://purl.org/vocab/vann/> .  #A vocabulary for annotating vocabulary descriptions
-@prefix voaf: <http://purl.org/vocommons/voaf#> . #A vocabulary of a friend, for describing relations between linked vocabularies
-@prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> . #Semantic web vocabulary status ontology
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .       #Resource data framework
+@prefix owl: <http://www.w3.org/2002/07/owl#> .                    #Owl ontology language
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .            #RDF schema
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .                 #XML standard datatypes
+@prefix dc: <http://purl.org/dc/terms/> .                          #Dublin Core Metadata Initiative terms
+@prefix vann: <http://purl.org/vocab/vann/> .                      #A vocabulary for annotating vocabulary descriptions
+@prefix voaf: <http://purl.org/vocommons/voaf#> .                  #A vocabulary of a friend, for describing relations between linked vocabularies
+@prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> .      #Semantic web vocabulary status ontology
 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
-@prefix saref: <https://w3id.org/saref#>. #SAREF smart building appliances ontology
-@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> . #QUDT
+@prefix saref: <https://w3id.org/saref#>.                          #SAREF smart building appliances ontology
+@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> .              #QUDT
 @prefix qudt-quantity: <http://data.nasa.gov/qudt/owl/quantity#> . #QUDT quantities
-@prefix qudt-unit: <http://data.nasa.gov/qudt/owl/unit#> . #QUDT units
+@prefix qudt-unit: <http://data.nasa.gov/qudt/owl/unit#> .         #QUDT units
 
-@prefix smartapi: <http://www.smart-api.io/ontology/1.0/>.
-@base <http://www.smart-api.io/ontology/1.0/>.
+@prefix smartapi: <http://smart-api.io/ontology/1.0/smartapi#>.
+@base <http://smart-api.io/ontology/1.0/>.
 
 #Core roles and activities (for devices and systems), this is related to actor module and could specialize it but now here defined as new vocabulary
 smartapi:QuantityUnitOntology a owl:Ontology , voaf:Ontology ;
@@ -47,8 +47,8 @@ smartapi:QuantityUnitOntology a owl:Ontology , voaf:Ontology ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0/> ;
-  owl:versionIRI <http://www.smart-api.io/ontology/1.0/QuantityUnitOntology/1.0> ;
+  vann:preferredNamespaceUri <http://smart-api.io/ontology/1.0/smartapi#> ;
+  owl:versionIRI <http://smart-api.io/ontology/1.0/QuantityUnitOntology> ;
   owl:versionInfo "v1.0" .
 
 

diff --git a/Ontology/src/1.0/SecurityOntology-1.0.ttl b/Ontology/src/1.0/SecurityOntology-1.0.ttl
index af8524f1fc6041bd5047ce7288633fbc6ec0ee23..6c39846f7125367f469f51480399ef05d9e657b2 100644 (file)
--- a/Ontology/src/1.0/SecurityOntology-1.0.ttl
+++ b/Ontology/src/1.0/SecurityOntology-1.0.ttl
@@ -13,20 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . #Resource data framework
-@prefix owl: <http://www.w3.org/2002/07/owl#> .              #Owl ontology language
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .      #RDF schema
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .           #XML standard datatypes
-@prefix dc: <http://purl.org/dc/terms/> .     #Dublin Core Metadata Initiative terms
-@prefix vann: <http://purl.org/vocab/vann/> .  #A vocabulary for annotating vocabulary descriptions
-@prefix voaf: <http://purl.org/vocommons/voaf#> . #A vocabulary of a friend, for describing relations between linked vocabularies
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .  #Resource data framework
+@prefix owl: <http://www.w3.org/2002/07/owl#> .               #Owl ontology language
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .       #RDF schema
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .            #XML standard datatypes
+@prefix dc: <http://purl.org/dc/terms/> .                     #Dublin Core Metadata Initiative terms
+@prefix vann: <http://purl.org/vocab/vann/> .                 #A vocabulary for annotating vocabulary descriptions
+@prefix voaf: <http://purl.org/vocommons/voaf#> .             #A vocabulary of a friend, for describing relations between linked vocabularies
 @prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> . #Semantic web vocabulary status ontology
 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
 @prefix gr: <http://purl.org/goodrelations/v1#> .
-@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> . #QUDT
+@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> .         #QUDT
 
-@prefix smartapi: <http://www.smart-api.io/ontology/1.0/>.
-@base <http://www.smart-api.io/ontology/1.0/>.
+@prefix smartapi: <http://smart-api.io/ontology/1.0/smartapi#>.
+@base <http://smart-api.io/ontology/1.0/>.
 
 
 #smartapi classes related to network security
@@ -45,8 +45,8 @@ smartapi:SecurityOntology a owl:Ontology , voaf:Ontology ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0> ;
-  owl:versionIRI <http://www.smart-api.io/ontology/SecurityOntology/1.0> ;
+  vann:preferredNamespaceUri <http://smart-api.io/ontology/1.0/smartapi#> ;
+  owl:versionIRI <http://smart-api.io/ontology/1.0/SecurityOntology> ;
   owl:versionInfo "v1.0" .
 
 # security

diff --git a/Ontology/src/1.0/TradingOntology-1.0.ttl b/Ontology/src/1.0/TradingOntology-1.0.ttl
index 0a7e30d8a0b7d9c939675d2fb1c03164060a7d59..a3811920d655411e54c18b000bfa1604a93269f6 100644 (file)
--- a/Ontology/src/1.0/TradingOntology-1.0.ttl
+++ b/Ontology/src/1.0/TradingOntology-1.0.ttl
@@ -13,44 +13,37 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> . #Resource data framework
-@prefix owl: <http://www.w3.org/2002/07/owl#> .              #Owl ontology language
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .      #RDF schema
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .           #XML standard datatypes
-@prefix dc: <http://purl.org/dc/terms/> .     #Dublin Core Metadata Initiative terms
-@prefix vann: <http://purl.org/vocab/vann/> .  #A vocabulary for annotating vocabulary descriptions
-@prefix voaf: <http://purl.org/vocommons/voaf#> . #A vocabulary of a friend, for describing relations between linked vocabularies
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .  #Resource data framework
+@prefix owl: <http://www.w3.org/2002/07/owl#> .               #Owl ontology language
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .       #RDF schema
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .            #XML standard datatypes
+@prefix dc: <http://purl.org/dc/terms/> .                     #Dublin Core Metadata Initiative terms
+@prefix vann: <http://purl.org/vocab/vann/> .                 #A vocabulary for annotating vocabulary descriptions
+@prefix voaf: <http://purl.org/vocommons/voaf#> .             #A vocabulary of a friend, for describing relations between linked vocabularies
 @prefix vs: <http://www.w3.org/2003/06/sw-vocab-status/ns#> . #Semantic web vocabulary status ontology
 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
 @prefix gr: <http://purl.org/goodrelations/v1#> .
-@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> . #QUDT
+@prefix qudt: <http://data.nasa.gov/qudt/owl/qudt#> .         #QUDT
 
-@prefix smartapi: <http://www.smart-api.io/ontology/1.0/>.
-@base <http://www.smart-api.io/ontology/1.0/>.
+@prefix smartapi: <http://smart-api.io/ontology/1.0/smartapi#>.
+@base <http://smart-api.io/ontology/1.0/>.
 
 
 #smartapi classes related to trading and pricing
 smartapi:TrandingOntology a owl:Ontology , voaf:Ontology ;
-  dc:title "SmartAPI-DataOntology ontology"@en ;
-  dc:description "The Smart API data Ontology."@en ;
+  dc:title "SmartAPI-TradingOntology ontology"@en ;
+  dc:description "The Smart API trading Ontology."@en ;
   dc:issued "2016-01-26"^^xsd:date ;
   dc:modified "2016-10-06"^^xsd:date ;
-  dc:creator <http://www.vtt.fi/JarmoKalaoja> ;
-  dc:creator <http://www.maxime-lefrancois.info/me#> ;
-  dc:contributor <http://zimmer.aprilfoolsreview.com/antoine#me> ;
-  dc:contributor [a foaf:Person ; foaf:name "Erkki Siira" ] ;
-  dc:contributor [a foaf:Person ; foaf:name "Takoua Ghariani" ] ;
-  dc:contributor [a foaf:Person ; foaf:name "Marc Girod-Genet" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Hannu Järvinen" ] ;
-  dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <http://www.smart-api.io/ontology/1.0/> ;
-  owl:versionIRI <http://www.smart-api.io/ontology/TradingOntology/1.0> ;
+  vann:preferredNamespaceUri <http://smart-api.io/ontology/1.0/smartapi#> ;
+  owl:versionIRI <http://smart-api.io/ontology/1.0/TradingOntology> ;
   owl:versionInfo "v1.0" .
 
 # boolean flags
-    
+
 smartapi:isCurrentlyFrozen a owl:ObjectProperty ;
   rdfs:label "Is currently frozen"@en ;
   rdfs:range xsd:boolean ;

diff --git a/Ontology/src/1.0/smartapi-1.0.ttl b/Ontology/src/1.0/smartapi-1.0.ttl
index fed34907768017ad9ccac7375029d2c77d7862be..f310bc02f097c44b6968a0d4ab28aa8022abeeb3 100644 (file)
--- a/Ontology/src/1.0/smartapi-1.0.ttl
+++ b/Ontology/src/1.0/smartapi-1.0.ttl
@@ -26,10 +26,10 @@
 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
 @prefix vcard: <http://www.w3.org/2006/vcard/ns#> .
 
-@prefix smartapi: <http://www.smart-api.io/ontology/1.0/>.
+@prefix smartapi: <http://smart-api.io/ontology/1.0/>.
 
 
-<http://www.smart-api.io/ontology/1.0/> rdf:type voaf:Ontology , owl:Ontology ;
+<http://smart-api.io/ontology/1.0/> rdf:type voaf:Ontology , owl:Ontology ;
   dc:title "Smart API Ontology"@en ;
   dc:description "The Smart API ontology, that glues together all of the Smart API vocabularies"@en ;
   dc:creator <http://maxime-lefrancois.info/me#> ;
@@ -41,10 +41,11 @@
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Hannu Järvinen" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
-  dc:issued "2016-05-25"^^xsd:date ;
+  dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
+  dc:issued "2019-01-01"^^xsd:date ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <https://www.smart-api.io/ontology/1.0/> ;
-  owl:versionIRI <https://www.smart-api.io/ontology/1.0> ;
+  vann:preferredNamespaceUri <http://smart-api.io/ontology/1.0/> ;
+  owl:versionIRI <http://smart-api.io/ontology/1.0> ;
   owl:versionInfo "v1.0" ;
   owl:imports <http://data.qudt.org/qudt/owl/1.0.0/qudt.owl> ;
   owl:imports <http://data.qudt.org/qudt/owl/1.0.0/quantity.owl> ;

diff --git a/Ontology/src/1.0/smartapi_noexternals-1.0.ttl b/Ontology/src/1.0/smartapi_noexternals-1.0.ttl
index c6185b353b7f7d66d460cf189a856f39088b9ee5..79e0d7bc6bb3162ca3f6ef52acecdb36b677bf69 100644 (file)
--- a/Ontology/src/1.0/smartapi_noexternals-1.0.ttl
+++ b/Ontology/src/1.0/smartapi_noexternals-1.0.ttl
@@ -26,25 +26,17 @@
 @prefix foaf: <http://xmlns.com/foaf/0.1/>.
 @prefix vcard: <http://www.w3.org/2006/vcard/ns#> .
 
-@prefix smartapi: <http://www.smart-api.io/ontology/1.0/>.
+@prefix smartapi: <http://smart-api.io/ontology/1.0/>.
 
 
-<http://www.smart-api.io/ontology/1.0/> rdf:type voaf:Ontology , owl:Ontology ;
+<http://smart-api.io/ontology/1.0/> rdf:type voaf:Ontology , owl:Ontology ;
   dc:title "Smart API Ontology"@en ;
   dc:description "The Smart API ontology, that glues together all of the Smart API vocabularies"@en ;
-  dc:creator <http://maxime-lefrancois.info/me#> ;
-  dc:contributor <http://www.vtt.fi/JarmoKalaoja> ;
-  dc:contributor <http://zimmer.aprilfoolsreview.com/antoine#me> ;
-  dc:contributor [a foaf:Person ; foaf:name "Erkki Siira" ] ;
-  dc:contributor [a foaf:Person ; foaf:name "Takoua Ghariani" ] ;
-  dc:contributor [a foaf:Person ; foaf:name "Marc Girod-Genet" ] ;
   dc:contributor [a foaf:Person ; foaf:name "Jani Hursti" ] ;
-  dc:contributor [a foaf:Person ; foaf:name "Hannu Järvinen" ] ;
-  dc:contributor [a foaf:Person ; foaf:name "Pyry Lehtimäki" ] ;
-  dc:issued "2016-05-25"^^xsd:date ;
+  dc:issued "2019-01-01"^^xsd:date ;
   vann:preferredNamespacePrefix "smartapi" ;
-  vann:preferredNamespaceUri <https://www.smart-api.io/ontology/1.0/> ;
-  owl:versionIRI <https://www.smart-api.io/ontology/1.0> ;
+  vann:preferredNamespaceUri <http://smart-api.io/ontology/1.0/> ;
+  owl:versionIRI <http://smart-api.io/ontology/1.0> ;
   owl:versionInfo "v1.0" ;
   owl:imports smartapi:AbstractEntityOntology-1.0.ttl ;
   owl:imports smartapi:CommonStructureOntology-1.0.ttl ;