From 27f829103c088b3832a306d160e49c4ac7a95b77 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Mon, 17 May 2021 13:29:17 +0200 Subject: [PATCH 01/22] Updated discovery ontology Modifications: * Add terms ttl and retrieve * Modified classes names * Added class ThingEnriched --- context/discovery-ontology.ttl | 66 +++++++++++++++++----------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/context/discovery-ontology.ttl b/context/discovery-ontology.ttl index 5a2fe3e8..62a4f6b7 100644 --- a/context/discovery-ontology.ttl +++ b/context/discovery-ontology.ttl @@ -8,70 +8,72 @@ @prefix vann: . @prefix discovery: . @prefix td: . -@prefix dct: . @prefix schema: . @base . - rdf:type owl:Ontology ; -dc:creator "Andrea Cimmino" ; -dc:creator "Farshid Tavakolizadeh" ; -dc:description "Ontology code generated with Chowlk" ; -owl:versionInfo "0.1.1" ; -dc:title "WoT discovery ontology" . + rdf:type owl:Ontology ; + dc:creator "Andrea Cimmino" ; + dc:creator "Farshid Tavakolizadeh" ; + owl:versionInfo "0.1.1" ; + dc:title "WoT discovery ontology" ; + dc:description "Ontology code created by Chowlk" . ################################################################# -# Object Properties +# Object Properties ################################################################# -### discovery:hasRegistrationInformation -discovery:hasRegistrationInformation rdf:type owl:ObjectProperty ; - rdfs:domain td:Thing ; - rdfs:range discovery:RegistrationInformation ; - rdfs:label "has registration information" . - ################################################################# -# Data Properties +# Data Properties ################################################################# ### schema:dateCreated schema:dateCreated rdf:type owl:DatatypeProperty ; -rdfs:label "date created" . + rdfs:label "date created" . ### schema:dateModified schema:dateModified rdf:type owl:DatatypeProperty ; -rdfs:label "date modified" . + rdfs:label "date modified" . ### schema:expires schema:expires rdf:type owl:DatatypeProperty ; -rdfs:label "expires" . + rdfs:label "expires" . + +### discovery:ttl +discovery:ttl rdf:type owl:DatatypeProperty ; + rdfs:label "ttl" . + +### discovery:retrieve +discovery:retrieve rdf:type owl:DatatypeProperty ; + rdfs:label "retrieve" . ################################################################# -# Classes +# Classes ################################################################# ### td:Thing td:Thing rdf:type owl:Class ; rdfs:label "Thing" . -### discovery:RegistrationInformation -discovery:RegistrationInformation rdf:type owl:Class ; - rdfs:label "Registration Information" . - -### discovery:LinkDescription -discovery:LinkDescription rdf:type owl:Class ; - rdfs:label "Link Description" ; +### discovery:ThingEnriched +discovery:ThingEnriched rdf:type owl:Class ; + rdfs:label "Thing Enriched" ; rdfs:subClassOf td:Thing . -### discovery:DirectoryDescription -discovery:DirectoryDescription rdf:type owl:Class ; - rdfs:label "Directory Description" ; - rdfs:subClassOf td:Thing . +### discovery:ThingLink +discovery:ThingLink rdf:type owl:Class ; + rdfs:label "Thing Link" ; + rdfs:subClassOf discovery:ThingEnriched . + +### discovery:ThingDirectory +discovery:ThingDirectory rdf:type owl:Class ; + rdfs:label "Thing Directory" ; + rdfs:subClassOf discovery:ThingEnriched . ################################################################# -# Instances +# Instances ################################################################# ################################################################# -# General Axioms +# General Axioms ################################################################# From 5ae3d35a2e0ab985e1d1df8f16594a552f5eab6c Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Mon, 17 May 2021 13:29:39 +0200 Subject: [PATCH 02/22] Updated diagram --- context/discovery-ontology-chowlk.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/context/discovery-ontology-chowlk.xml b/context/discovery-ontology-chowlk.xml index e2572805..950d87d9 100644 --- a/context/discovery-ontology-chowlk.xml +++ b/context/discovery-ontology-chowlk.xml @@ -1,2 +1,2 @@ -7Vrfb6M4EP5rIt09NMIQSHhM0/bupF3t6bbS7j464IAVwJxxmrR//Y3B/LAhaa5NdvtAFCXMYI899nyfx4aJs0oPf3Ccx59ZSJKJbYWHiXM3sW00sz34k5rnSuPZVqWIOA1VoVbxlb4QpayL7WhICq2gYCwRNNeVAcsyEghNhzlne73YhiV6qzmOSE/xNcBJX/uNhiKutAt73ur/JDSK65aR51d3UlwXVp4UMQ7ZvqNy7ifOijMmqqv0sCKJHLx6XKp6D0fuNh3jJBPnVLCrCk842SnfJraXQNXbkD7BZVRdFgF7Ihxmawk6nOagzNaF/IuFkIO+lE3YDxEV8W49DVgKwt4J5C8TN60B26ntr3ltXoSv2t3v99O9M2U8AsG2kF8Zhl+oPGSz1kCJjiMDvhVBTFJcNmTJNpsmqxuqyWPmyikUz3VcwGzm8jJjAv5u9zEV5GuOA6nbAxRKv9IEJCR7i4NtxNkuC7/sREIzovQh5tsvUIsKCQ9rarlNWzCGghyOzjVqIgigR1hKhBxyq65Qw0ehbjZX8r6NYdtXurgbv5ZSYoWbqLHdhhZcqOgajjSnF2nlvD/GNIt6A1mOCpE1rdfHschw/sj+ZrQcBqnJ5XXZV/cWvtYUBmZlTVwwvSpl25AdQ54ZsmvIniHPDXlhyL4uSwn6pMuOIbuGPDdkv2Nf+ocM/5DhHzL8Q4Z/yPAPGf4hwz9k+NfKyPAPGf4hwz9k+Ida/+B7kdifzV099r1+7CPL7ce+c4HQn/VCv8uo/5CIFoJjQVn2V7ZhPC0vR0yMmLguJhaWvh641gAmhtaDS2DCHUg8jIAnWbiUyRpIQYKLggZ6jJMDFd/LFXKhpB+dO3cHhZRSeK6FDPr5vSv8KC24tdhWK6W2Xp2GyrYwD5Qk7wF42bZJBMv2Q0gXlSOMi5hFLMPJfatV0yfLaZNXsB0PiLZgCswjIjQiOWOKO1PoDsxgreMkAbJ50jsxNK2qhYpQWladGRFkG5FR+aNqddNQw5DnzE8bqkahZ6iMssbtswLPO5rxFjnOtAj0/t0xoSVqNwFLGK+yRR6tf7NngHpJPfBrz/z22rV+b+v38+g2nawaVfmks4xxcXQ9+Em9PJlMa901AQtUJHSI4oRGmcQvxCuBHt1KwqKwkVqqGykNwxIQnBT0Ba+TGlT6ciUZL8Frktw2Tq4qH6FdZ1N+TpGi2ggq++32q4sk9yRZ3gB52/U27p2wMYObbTYFeW9cz/8Xoa4TFmz1udqwTHQG1YKP72s063ZotmHWIzQbPlDZVYN0W55tqPpjka7fJ13ng5HujbGNcz33baRrGpr5hqHLke7iZAb8iWbbO1IEnOZj5jtmvtfPfF0jb2nOH7uZ7xCEL5H5+iexcEc5LFQMWHAExAiInwUI5xxALK50PFIvQ2Pq8q7UZfHxUxfHmU/1czjPfeOO0e2Zcs1T6sulLwj1IrR5bhBiQVacwG848vTI0yd4OsRFXAYDutL5nTNA2tc6v0P9J4caJD6zkG7oiIkRE78WE0PPea6Gif4zzoEnzs35WnMsGABmArmEqEO75rRt3amjPR1fZiGUh6ZWNE1pxsz7Zz/+fltnrAfMixjctq1H/IS3LKEvOCTx25tlexjUJUx9oU49j7cN4SdB8S4HBRWSj84a62/sEVrtnN1akG1Cshk9H+uEwXj1WwEhC3ZpGcevvhlQceSnda044+yzyiqNLNiyVHas0k9g7cFsuSxXqBR1Cnma9pldBpvI1rHpDGBzMPv0L4HN/kPYZr0ihxx23cW4VI1L1a9cqvzrLVUgtu+UVRug9s085/4/ \ No newline at end of file +7Vptj9o4EP41fCyK8wb5yLK7vZNa9aRdqe1HE5vEIomRYzZsf/2NE+fNCQvtQbc6BSGSmdhjz3ie8TjDzFmnx48C7+PPnNBkZlvkOHPuZ7aNXNuHi+K8VhzftipGJBjRjVrGE/tBNbNudmCE5r2GkvNEsn2fGfIso6Hs8bAQvOg32/KkP+oeR3TAeApxMuR+ZUTGFXdpL1r+X5RFcT0y8oPqSYrrxlqTPMaEFx2W8zBz1oJzWd2lxzVNlPFqu1T9Hk88bSYmaCYv6WBXHV5wctC6zWw/ga53hL3AbVTd5iF/oQJWawU8nO6BmW1ydYmlVEZfqSHsx4jJ+LCZhzwFonBC9cvlh1aA7dTyN6IWL8lZuUVRzAtnzkUEhG2hoBIMv9B5TGbNgRYdRUZ0y8OYprgcyFJjNkNWD/SQp8SVSyhfa7+A1dyr24xLuNwVMZP0aY9DxSsACqVeaQIUUrPF4S4S/JCRLweZsIxqPsFi9wV6MangYc0trxmru7B6rcGskh47LL3QHylPqVQmt+qnNXw06tyFpovWh+1A8+Ku/1qaiTVuokZ261pwo71r3NOcgaeV6/4csywaGLK0ClU9rfN2zDO8f+b/cFZaRnH26r6cq3cHX2sOhllbMw9Er0vaNmjHoF2D9gzaN+iFQS8NOujTioI59WnHoD2DXhh00JGv9EOGfsjQDxn6IUM/ZOiHDP2QoR8y9GtpZOiHDP2QoR8y9EOtfvC9iu+7ft/3HWfo+wiANvB95wqu7w5cvxtRSwQ8ZIJBwCETEiYk3BgJaDH3+vuANYKFsX3gGljwRhIOw+VpRlYqSQNqk/Bw1/fxLc/kmidclI0dCz5BAHx6ZPJbuV96mvquQaPu749d4rUmMvLI1FRrSqeaS6CwCDWlnuVS8F2T7Kl5UAIpoZ40FzLmEc9w8tByQR7Y5lvdXBHf2/kpsp1USdWzOrnIOT+IUBtJp5oSi4jKXphRE3vTETrL7I2scs0TNMGSvfRT3rGl1yNUYafxsw9GtuH5Xl9EpY3u1U1RDUG+ZaQttuGGlQ0GgkpPbNS+yDn984H6E8t2U5CegvRtg3RzIK593h8J0WPgvUaIXpxHwT0TcK7mWu4EhQkKN4PCYnkBFJY3ytyXU7ZylWzF/9OzFccxs2LfM/zn0nzFG4jyzPcn18tYgoGDNi+0CJZ0LSj8kilKT1H6jShNcB6XzoBudsQce91yqyNmffA4BYrPnLAtm1AxoeK9UTGWytwMFWiAipFySFNJaWo/IaAmVNuIymFWnULIptOnV7pZZQTaw1BrlqYs4+bzi2szvzYZ6xGLPAa1besZv+AdT9gPTGj868PyAoy6gpXOGc/+zrb89NjggAoW/0lByaSKSBfZ+it/VnXUtr5mQcIJ+Wb0+pMlK8LDQ1o699myVRUlP21qRoI3NLlrilmddHdbfpqE1EiELUsnyDpzRfZ4wly2y3V2O4dUrfdxr1QcM07czgg2RxPQ4BrYHJZhmx2LHvdw2M6nzWrarN53swp+52Y1rBb/bw/eFx2g3eEB2vmjDtCua5sHaNMRLj1AL1y7f3y+3Qt/9HZpVspkirtT3H3XuOt5vzPuDsuzXTwIkMcoxIgJFBMo3hUU9u1AAWT7/8tqT2n/xeo8/As= From 0e3932020cab58525ed245eac365f675ee9d4393 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Mon, 17 May 2021 13:37:45 +0200 Subject: [PATCH 03/22] Update discovery-context.jsonld --- context/discovery-context.jsonld | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/context/discovery-context.jsonld b/context/discovery-context.jsonld index 591f2d43..220a7554 100644 --- a/context/discovery-context.jsonld +++ b/context/discovery-context.jsonld @@ -2,18 +2,18 @@ "@context": { "discovery": "https://www.w3.org/2021/wot/discovery#", "schema": "http://schema.org/", - "DirectoryDescription": { - "@id": "discovery:DirectoryDescription" + "ThingDirectory": { + "@id": "discovery:ThingDirectory" }, - "LinkDescription": { - "@id": "discovery:LinkDescription" + "ThingDirectory": { + "@id": "discovery:ThingDirectory" }, - "RegistrationInformation": { - "@id": "discovery:RegistrationInformation" + "ThingEnriched": { + "@id": "discovery:ThingEnriched" }, - "registration": "discovery:hasRegistrationInformation", - "created": "schema:dateCreated", - "modified": "schema:dateModified", - "expires": "schema:expires" + "discovery:registration": "discovery:hasRegistrationInformation", + "discovery:created": "schema:dateCreated", + "discovery:modified": "schema:dateModified", + "discovery:expires": "schema:expires" } } From 735f1218358dbf6c6c2c78243b0f6f3d0a75bb66 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Mon, 17 May 2021 13:42:14 +0200 Subject: [PATCH 04/22] Update discovery-context.jsonld --- context/discovery-context.jsonld | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/context/discovery-context.jsonld b/context/discovery-context.jsonld index 220a7554..8aa712f3 100644 --- a/context/discovery-context.jsonld +++ b/context/discovery-context.jsonld @@ -11,9 +11,11 @@ "ThingEnriched": { "@id": "discovery:ThingEnriched" }, - "discovery:registration": "discovery:hasRegistrationInformation", - "discovery:created": "schema:dateCreated", - "discovery:modified": "schema:dateModified", - "discovery:expires": "schema:expires" + "created": "schema:dateCreated", + "modified": "schema:dateModified", + "expires": "schema:expires", + "ttl": "discovery:ttl", + "retrieve": "discovery:retrieve" + } } From d6cdb0c0184ecf72a2bec79cd6b3e9c8a0f4060b Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Mon, 17 May 2021 13:44:37 +0200 Subject: [PATCH 05/22] Update discovery-context.jsonld --- context/discovery-context.jsonld | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/context/discovery-context.jsonld b/context/discovery-context.jsonld index 8aa712f3..e5d42e92 100644 --- a/context/discovery-context.jsonld +++ b/context/discovery-context.jsonld @@ -5,8 +5,8 @@ "ThingDirectory": { "@id": "discovery:ThingDirectory" }, - "ThingDirectory": { - "@id": "discovery:ThingDirectory" + "ThingLink": { + "@id": "discovery:ThingLink" }, "ThingEnriched": { "@id": "discovery:ThingEnriched" From f3c91d08c8cf8a83bfd314653822c43b40a25438 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Mon, 17 May 2021 13:45:17 +0200 Subject: [PATCH 06/22] Update discovery-context.jsonld --- context/discovery-context.jsonld | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/context/discovery-context.jsonld b/context/discovery-context.jsonld index e5d42e92..59fcc6c9 100644 --- a/context/discovery-context.jsonld +++ b/context/discovery-context.jsonld @@ -1,6 +1,6 @@ { "@context": { - "discovery": "https://www.w3.org/2021/wot/discovery#", + "discovery": "https://raw.githubusercontent.com/AndreaCimminoArriaga/wot-discovery/main/context/discovery-ontology.ttl", "schema": "http://schema.org/", "ThingDirectory": { "@id": "discovery:ThingDirectory" From 42281ff3da6ae5a643f0dbc98a121dbb4f21aee1 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Mon, 17 May 2021 13:47:28 +0200 Subject: [PATCH 07/22] Update discovery-context.jsonld --- context/discovery-context.jsonld | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/context/discovery-context.jsonld b/context/discovery-context.jsonld index 59fcc6c9..a1009c75 100644 --- a/context/discovery-context.jsonld +++ b/context/discovery-context.jsonld @@ -1,6 +1,6 @@ { "@context": { - "discovery": "https://raw.githubusercontent.com/AndreaCimminoArriaga/wot-discovery/main/context/discovery-ontology.ttl", + "discovery": "https://www.w3.org/2021/wot/discovery#", "schema": "http://schema.org/", "ThingDirectory": { "@id": "discovery:ThingDirectory" @@ -16,6 +16,5 @@ "expires": "schema:expires", "ttl": "discovery:ttl", "retrieve": "discovery:retrieve" - } } From 24995a711de9d1482838c4990103f1a4d3520d26 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Mon, 17 May 2021 13:53:55 +0200 Subject: [PATCH 08/22] Update directory-td-class-diagram.puml --- images/directory-td-class-diagram.puml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/images/directory-td-class-diagram.puml b/images/directory-td-class-diagram.puml index d3fc1542..2fe29f21 100644 --- a/images/directory-td-class-diagram.puml +++ b/images/directory-td-class-diagram.puml @@ -2,10 +2,12 @@ hide members class "td:Thing" -class "discovery:RegistrationInformation" { +class "discovery:ThingEnriched" { schema:dateCreated : xsd:datetime schema:dateModified : xsd:datetime schema:expires : xsd:datetime + discovery:ttl : xsd:integer + discovery:retrieved : xsd:datetime } @@ -14,12 +16,12 @@ note left of "td:Thing" end note -"td:Thing" --> "discovery:RegistrationInformation" : "discovery:hasRegistrationInformation" -"discovery:LinkDescription" --|> "td:Thing" -"discovery:DirectoryDescription" --|> "td:Thing" +"discovery:ThingEnriched" --|> "td:Thing" +"discovery:ThingLink" --|> "discovery:ThingEnriched" +"discovery:ThingDirectory" --|> "discovery:ThingEnriched" -show "discovery:RegistrationInformation" attributes +show "discovery:ThingEnriched" attributes note "Prefixes:\n\tdiscovery: https://www.w3.org/2021/wot/discovery#\n\ttd: https://www.w3.org/2019/wot/td#\n\tschema: http://schema.org/" as N1 @enduml From e3b12459f0826a4adc6b52c99f027b5b22512a61 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Mon, 17 May 2021 13:55:29 +0200 Subject: [PATCH 09/22] Update directory-td-class-diagram.puml --- images/directory-td-class-diagram.puml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/images/directory-td-class-diagram.puml b/images/directory-td-class-diagram.puml index 2fe29f21..b61ee75a 100644 --- a/images/directory-td-class-diagram.puml +++ b/images/directory-td-class-diagram.puml @@ -10,14 +10,10 @@ class "discovery:ThingEnriched" { discovery:retrieved : xsd:datetime } - note left of "td:Thing" Thing Description (TD) end note - - - "discovery:ThingEnriched" --|> "td:Thing" "discovery:ThingLink" --|> "discovery:ThingEnriched" "discovery:ThingDirectory" --|> "discovery:ThingEnriched" From 2ad609e869df15e8d32663b8e2bbf41353cd5011 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Mon, 17 May 2021 13:55:56 +0200 Subject: [PATCH 10/22] Add files via upload --- images/directory-td-class-diagram.svg | 30 ++++++++++++++------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/images/directory-td-class-diagram.svg b/images/directory-td-class-diagram.svg index 023eb0c9..75000c13 100644 --- a/images/directory-td-class-diagram.svg +++ b/images/directory-td-class-diagram.svg @@ -1,19 +1,21 @@ -td:Thingdiscovery:RegistrationInformationschema:dateCreated : xsd:datetimeschema:dateModified : xsd:datetimeschema:expires : xsd:datetimeThing Description (TD)discovery:LinkDescriptiondiscovery:DirectoryDescriptionPrefixes:discovery: https://www.w3.org/2021/wot/discovery#td: https://www.w3.org/2019/wot/td#schema: http://schema.org/discovery:hasRegistrationInformationtd:Thingdiscovery:ThingEnrichedschema:dateCreated : xsd:datetimeschema:dateModified : xsd:datetimeschema:expires : xsd:datetimediscovery:ttl : xsd:integerdiscovery:retrieved : xsd:datetimeThing Description (TD)discovery:ThingLinkdiscovery:ThingDirectoryPrefixes:discovery: https://www.w3.org/2021/wot/discovery#td: https://www.w3.org/2019/wot/td#schema: http://schema.org/td:Thingdiscovery:ThingEnrichedschema:dateCreated : xsd:datetimeschema:dateModified : xsd:datetimeschema:expires : xsd:datetimediscovery:ttl : xsd:integerdiscovery:retrieved : xsd:datetimeThing Description (TD)discovery:ThingLinkdiscovery:ThingDirectoryPrefixes:discovery: https://www.w3.org/2021/wot/discovery#td: https://www.w3.org/2019/wot/td#schema: http://schema.org/td:Thingdiscovery:RegistrationInformationschema:dateCreated : xsd:datetimeschema:dateModified : xsd:datetimeschema:expires : xsd:datetimeThing Description (TD)discovery:LinkDescriptiondiscovery:DirectoryDescriptionPrefixes:discovery: https://www.w3.org/2021/wot/discovery#td: https://www.w3.org/2019/wot/td#schema: http://schema.org/discovery:hasRegistrationInformation "discovery:RegistrationInformation" : "discovery:hasRegistrationInformation" -"discovery:ThingEnriched" --|> "td:Thing" -"discovery:ThingLink" --|> "discovery:ThingEnriched" -"discovery:ThingDirectory" --|> "discovery:ThingEnriched" +"discovery:LinkDescription" --|> "td:Thing" +"discovery:DirectoryDescription" --|> "td:Thing" -show "discovery:ThingEnriched" attributes +show "discovery:RegistrationInformation" attributes note "Prefixes:\n\tdiscovery: https://www.w3.org/2021/wot/discovery#\n\ttd: https://www.w3.org/2019/wot/td#\n\tschema: http://schema.org/" as N1 @enduml From 6b78c05a2a34efdf28f0c9cbab6e07ec1ade036e Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Tue, 25 May 2021 17:33:46 +0200 Subject: [PATCH 16/22] Update discovery-context.jsonld --- context/discovery-context.jsonld | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/context/discovery-context.jsonld b/context/discovery-context.jsonld index 8273aead..d6cf551a 100644 --- a/context/discovery-context.jsonld +++ b/context/discovery-context.jsonld @@ -11,7 +11,8 @@ "ThingEnriched": { "@id": "discovery:ThingEnriched" }, - "created": "schema:dateCreated", + "created": { "@id": "http://schema.org/dateCreated" }, + "discovery:created": { "@id": "http://schema.org/dateCreated" }, "modified": "schema:dateModified", "expires": "schema:expires", "ttl": "discovery:ttl", From c72ff805969dfa88b1276aac38fd004a79e19bb1 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Tue, 25 May 2021 17:35:16 +0200 Subject: [PATCH 17/22] Update discovery-context.jsonld --- context/discovery-context.jsonld | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/context/discovery-context.jsonld b/context/discovery-context.jsonld index d6cf551a..21d769c4 100644 --- a/context/discovery-context.jsonld +++ b/context/discovery-context.jsonld @@ -11,8 +11,8 @@ "ThingEnriched": { "@id": "discovery:ThingEnriched" }, - "created": { "@id": "http://schema.org/dateCreated" }, - "discovery:created": { "@id": "http://schema.org/dateCreated" }, + "created": "http://schema.org/dateCreated", + "discovery:created": "http://schema.org/dateCreated", "modified": "schema:dateModified", "expires": "schema:expires", "ttl": "discovery:ttl", From 942e8ac94a9b65b80b01d4ca4077f26bc1bef679 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Tue, 25 May 2021 17:36:22 +0200 Subject: [PATCH 18/22] Update discovery-context.jsonld --- context/discovery-context.jsonld | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/context/discovery-context.jsonld b/context/discovery-context.jsonld index 21d769c4..be50d0c9 100644 --- a/context/discovery-context.jsonld +++ b/context/discovery-context.jsonld @@ -11,8 +11,7 @@ "ThingEnriched": { "@id": "discovery:ThingEnriched" }, - "created": "http://schema.org/dateCreated", - "discovery:created": "http://schema.org/dateCreated", + "created": "discovery:dateCreated", "modified": "schema:dateModified", "expires": "schema:expires", "ttl": "discovery:ttl", From 586ec65271f8af5c386b25eac16b38c399d0b540 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Tue, 25 May 2021 17:37:55 +0200 Subject: [PATCH 19/22] Update discovery-context.jsonld --- context/discovery-context.jsonld | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/context/discovery-context.jsonld b/context/discovery-context.jsonld index be50d0c9..295f23d7 100644 --- a/context/discovery-context.jsonld +++ b/context/discovery-context.jsonld @@ -8,13 +8,16 @@ "ThingLink": { "@id": "discovery:ThingLink" }, - "ThingEnriched": { - "@id": "discovery:ThingEnriched" + "created": { + "@id": "discovery:ThingLink" }, - "created": "discovery:dateCreated", "modified": "schema:dateModified", "expires": "schema:expires", - "ttl": "discovery:ttl", - "retrieved": "discovery:retrieve" + "ttl": { + "@id": "discovery:ttl" + }, + "retrieved": { + "@id": "discovery:retrieved" + } } } From 4cf7966cb5b558217c73e9ea071b6420fb3c7b67 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Wed, 26 May 2021 10:47:13 +0200 Subject: [PATCH 20/22] Update discovery-context.jsonld --- context/discovery-context.jsonld | 47 +++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/context/discovery-context.jsonld b/context/discovery-context.jsonld index 295f23d7..6bb5bc11 100644 --- a/context/discovery-context.jsonld +++ b/context/discovery-context.jsonld @@ -1,23 +1,44 @@ { "@context": { "discovery": "https://www.w3.org/2021/wot/discovery#", - "schema": "http://schema.org/", "ThingDirectory": { - "@id": "discovery:ThingDirectory" + "@id": "discovery:ThingDirectory", + "@type": "@id" }, "ThingLink": { - "@id": "discovery:ThingLink" + "@id": "discovery:ThingLink", + "@type": "@id" }, - "created": { - "@id": "discovery:ThingLink" - }, - "modified": "schema:dateModified", - "expires": "schema:expires", - "ttl": { - "@id": "discovery:ttl" - }, - "retrieved": { - "@id": "discovery:retrieved" + "registration": { + "@id": "discovery:hasRegistrationInformation", + "@type": "@id", + "@context": { + "schema": "http://schema.org/", + "RegistrationInformation": { + "@id": "discovery:RegistrationInformation", + "@type": "@id" + }, + "created": { + "@id": "schema:dateCreated", + "@type": "xsd:dateTime" + }, + "modified": { + "@id": "schema:dateModified", + "@type": "xsd:dateTime" + }, + "expires": { + "@id": "schema:expires", + "@type": "xsd:dateTime" + }, + "retrieved": { + "@id": "discovery:retrieved", + "@type": "xsd:dateTime" + }, + "ttl": { + "@id": "discovery:ttl", + "@type": "xsd:unsignedInt" + } + } } } } From d29ae0ff5ceb6423ab65a6b3d9c7cb2f5bd22c26 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Wed, 26 May 2021 11:17:37 +0200 Subject: [PATCH 21/22] Update discovery-ontology.ttl --- context/discovery-ontology.ttl | 66 +++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 24 deletions(-) diff --git a/context/discovery-ontology.ttl b/context/discovery-ontology.ttl index 90332501..f90b14da 100644 --- a/context/discovery-ontology.ttl +++ b/context/discovery-ontology.ttl @@ -12,68 +12,86 @@ @base . rdf:type owl:Ontology ; - dc:creator "Andrea Cimmino" ; - dc:creator "Farshid Tavakolizadeh" ; - owl:versionInfo "0.1.1" ; - dc:title "WoT discovery ontology" ; - dc:description "Ontology code created by Chowlk" . + dc:creator "Andrea Cimmino" ; + dc:creator "Farshid Tavakolizadeh" ; + owl:versionInfo "0.1.2" ; + dc:title "WoT discovery ontology" ; + dc:description "Ontology code created by Chowlk" . ################################################################# -# Object Properties +# Object Properties ################################################################# +### discovery:hasRegistrationInformation +discovery:hasRegistrationInformation rdf:type owl:ObjectProperty ; + rdfs:domain td:Thing ; + rdfs:range discovery:RegitrationInformation ; + rdfs:label "registration" . + ################################################################# -# Data Properties + +# Data Properties + ################################################################# ### schema:dateCreated schema:dateCreated rdf:type owl:DatatypeProperty ; - rdfs:label "date created" . + rdfs:domain discovery:RegitrationInformation ; + rdfs:range xsd:dateTime ; + rdfs:label "created"@en . ### schema:dateModified schema:dateModified rdf:type owl:DatatypeProperty ; - rdfs:label "date modified" . + rdfs:domain discovery:RegitrationInformation ; + rdfs:range xsd:dateTime ; + rdfs:label "modified"@en . ### schema:expires schema:expires rdf:type owl:DatatypeProperty ; - rdfs:label "expires" . + rdfs:domain discovery:RegitrationInformation ; + rdfs:range xsd:dateTime ; + rdfs:label "expires"@en . ### discovery:ttl discovery:ttl rdf:type owl:DatatypeProperty ; - rdfs:label "ttl" . + rdfs:domain discovery:RegitrationInformation ; + rdfs:range xsd:unsignedInt ; + rdfs:label "ttl"@en . ### discovery:retrieve discovery:retrieved rdf:type owl:DatatypeProperty ; - rdfs:label "retrieve" . + rdfs:domain discovery:RegitrationInformation ; + rdfs:range xsd:dateTime ; + rdfs:label "retrieved"@en . ################################################################# -# Classes + +# Classes + ################################################################# ### td:Thing td:Thing rdf:type owl:Class ; rdfs:label "Thing" . -### discovery:ThingEnriched -discovery:ThingEnriched rdf:type owl:Class ; - rdfs:label "Thing Enriched" ; - rdfs:subClassOf td:Thing . +### discovery:RegitrationInformation +discovery:RegitrationInformation rdf:type owl:Class ; + rdfs:label "RegitrationInformation" . ### discovery:ThingLink discovery:ThingLink rdf:type owl:Class ; - rdfs:label "Thing Link" ; - rdfs:subClassOf discovery:ThingEnriched . + rdfs:label "ThingLink" ; + rdfs:subClassOf td:Thing . ### discovery:ThingDirectory discovery:ThingDirectory rdf:type owl:Class ; - rdfs:label "Thing Directory" ; - rdfs:subClassOf discovery:ThingEnriched . + rdfs:label "ThingDirectory" ; + rdfs:subClassOf td:Thing . ################################################################# -# Instances +# Instances ################################################################# ################################################################# -# General Axioms +# General Axioms ################################################################# - From c08b936f3f2bb6ca1ba441a393fd1cc0b9b20ae9 Mon Sep 17 00:00:00 2001 From: Andrea Cimmino Arriaga Date: Wed, 26 May 2021 11:18:50 +0200 Subject: [PATCH 22/22] Update discovery-ontology-chowlk.xml --- context/discovery-ontology-chowlk.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/context/discovery-ontology-chowlk.xml b/context/discovery-ontology-chowlk.xml index 950d87d9..09d4d1bf 100644 --- a/context/discovery-ontology-chowlk.xml +++ b/context/discovery-ontology-chowlk.xml @@ -1,2 +1,2 @@ -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