Updated directory to new ontology model

context/discovery-context.jsonld

@@ -1,19 +1,44 @@
 {
   "@context": {
     "discovery": "https://www.w3.org/2021/wot/discovery#",
-    "schema": "http://schema.org/",
-    "DirectoryDescription": {
-      "@id": "discovery:DirectoryDescription"
+    "ThingDirectory": {
+      "@id": "discovery:ThingDirectory",
+      "@type": "@id"
     },
-    "LinkDescription": {
-      "@id": "discovery:LinkDescription"
+    "ThingLink": {
+      "@id": "discovery:ThingLink",
+      "@type": "@id"
     },
-    "RegistrationInformation": {
-      "@id": "discovery:RegistrationInformation"
-    },
-    "registration": "discovery:hasRegistrationInformation",
-    "created": "schema:dateCreated",
-    "modified": "schema:dateModified",
-    "expires": "schema:expires"
+    "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"
+        }
+      }
+    }
   }
 }

context/discovery-ontology-chowlk.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<mxfile host="app.diagrams.net" modified="2021-04-26T09:36:02.763Z" agent="5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.85 Safari/537.36" version="14.6.6" etag="XIRbDmwrvtHAUBXOKZq0"><diagram id="LhQrBxsUQyT8V3tOavLX">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/</diagram></mxfile>
+<mxfile host="app.diagrams.net" modified="2021-05-26T09:18:20.312Z" agent="5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36" version="14.6.13" etag="eoKGkfDRJcbQuprgsAb7" type="device"><diagram id="gx8tcw-dY9T01vp58GJx">7VrbcqM4EP0aP8aFuDl+dJxkd6tmarZ2UjU7jzLIoDIgl5Avma/fFkhcBLZJxnH2AZfLphuppZbOkRo1E2eZHv/geBt/ZSFJJrYVHifO48S2kWv78Cc1r6XG14qI01AVqhXf6S+ilJbS7mhI8lZBwVgi6LatDFiWkUC0dJhzdmgXW7Ok3eoWR6Sj+B7gpKv9QUMRl9p7e1br/yQ0inXLyJ+Xd1KsCytP8hiH7NBQOU8TZ8kZE+VVelySRA6eHpey3vOJu1XHOMnEkAp2WWGPk53ybWL7CVR9COkeLqPyMg/YnnCYrQXocLoFZbbK5V8shBz0hWzCfo6oiHeracBSEA5OIH+ZuKsN2I62v+LavAgv2j0cDtODM2U8AsG20Lw0DL9Quc+m1kCJhiM9vuVBTFJcNGTJNqsmyxuqyVPmiikUrxoXMJtbeZkxAX8Ph5gK8n2LA6k7ABUKv9IEJCR7i4NNxNkuC7/tREIzovQh5ptvUIsKSQ9ranlVWzCGghxPzjWqEATUIywlQg65pSto+ijWuTMlH2oM23Oli5v4tZQSK95Ele0aWnCh0NWPNKeDtGLeX2KaRZ2BLEaFyJrW5XHMM7x9YX8zWgyD1GzlddFX7wG+1hQGZmlNPDC9LGTbkB1Ddg3ZM2TfkGeGfG/I87YsJehTW3YM2TPkmSHPG/alf8jwDxn+IcM/ZPiHDP+Q4R8y/EOGf7WMDP+Q4R8y/EOGf6j2D75Xwb7n2i3sO34X+wiI1sG+cwXoux3oN1fUfwismhwLyrK/sjXjaXE5UmKkxMdSogpX9Hag4d+kRN92cA1KeD1xhwF4koULGauBtEpYsGkjfM0ysWQJ40Vhx4LPfA56cqTi32Lb9JT0U1FGXj8em8KrFrLwmcquaklFnPcgYR4oSd7LBWebKuaT/SAhRIaq04yLmEUsw8lTrQV7MDaNLknxp64thbpThaR7VQ6ItN+a4JzteKBUagIF5hHRkzMYBo1p9npmWes4SWBB2rc70Tf1qoVy0alQdldBSMHM8722jdIhVa0ZqhqWXNsIX2wDh+UwdAwVUKz8HoRO/+yCXYQsX2i2GdfocY3+2DXadQ3M94Utfey9xho9u8yCR8rh+ZopuyMVRip8GBV8awAV7j8ogr8fw5UrhCv+/z9cQd5s6rVw5nsGfobGK07HlGeeo1wvYpl3AFodbIVYkCUn8BuOq/S4Sp9ZpUOcxwUY0Ac9YTo3fMLUh52nKPGVhXRNR06MnPhcTvi35ATqiWM6KZEqm1LlfwLgTCC3EBm/LBrJkFWjTit9s8hCKA9NLWma0oyZ9wfnZ97XGesZ8zwGt23rBe/xhiX0Fw5J/P5m2QEGdQFTn6tz2tNtA/ym9m86KKiQ69Ggsf7BXmQutc6xWRBsQqwZvb4xbRWyYJcWOL6YuirXyC8rrUjwiiQPVUKrEequi08VjBpBsGWp4FhFrcjuD5aLcrmKbKe20/64V0qQGSdMfUmC3uBzfg1udlOx1X5Fjlt40M7HrWrcqj5zq5rfcqvq5oubp09CJCMbRjZ8Ihs875ZsOJ9C5mCPkj0ZKTFS4jMpYd+SEm9LIQcJznMatBF/6qyzPt3sP+s8d+Z6+YR1cvmkVG1+zZNSd/Ds3Oak1DXO4zuTOvSc1JvPzhu63ikp6iZ2L7zuGONcvp+T972gM+jZCtgl2qDDCY0yiUiYRwKPOA+SgzTAyULdSGkYFkCBkB8eW1eJhlZ7OX4c9th1kufq5Vhlf1K9ktpCmHd2AbiD1cnW77a+F0+6CFuvc/LGGQaxfle2LF6/cew8/Qc=</diagram></mxfile>

context/discovery-ontology.ttl

@@ -8,16 +8,15 @@
 @prefix vann: <http://purl.org/vocab/vann/> .
 @prefix discovery: <https://github.com/w3c/wot-discovery#> .
 @prefix td: <https://www.w3.org/2019/wot/td#> .
-@prefix dct: <http://purl.org/dc/terms/> .
 @prefix schema: <http://schema.org/> .
 @base <https://github.com/w3c/wot-discovery#> .
-<https://github.com/w3c/wot-discovery#> 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" .
+<https://github.com/w3c/wot-discovery#> rdf:type owl:Ontology ;
+	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
@@ -26,45 +25,67 @@ dc:title "WoT discovery ontology" .
 ### discovery:hasRegistrationInformation
 discovery:hasRegistrationInformation rdf:type owl:ObjectProperty ;
 	rdfs:domain td:Thing ;
-	rdfs:range discovery:RegistrationInformation ;
-	rdfs:label "has registration information" .
+	rdfs:range discovery:RegitrationInformation ;
+	rdfs:label "registration" .
 
 #################################################################
+
 # 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:domain discovery:RegitrationInformation ;
+	rdfs:range xsd:unsignedInt ;
+	rdfs:label "ttl"@en .
+
+### discovery:retrieve
+discovery:retrieved rdf:type owl:DatatypeProperty ;
+	rdfs:domain discovery:RegitrationInformation ;
+	rdfs:range xsd:dateTime ;
+	rdfs:label "retrieved"@en .
 
 #################################################################
+
 # 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:RegitrationInformation
+discovery:RegitrationInformation rdf:type owl:Class ;
+	rdfs:label "RegitrationInformation" .
 
-### discovery:LinkDescription
-discovery:LinkDescription rdf:type owl:Class ;
-	rdfs:label "Link Description" ;
+### discovery:ThingLink
+discovery:ThingLink rdf:type owl:Class ;
+	rdfs:label "ThingLink" ;
 	rdfs:subClassOf td:Thing .
 
-### discovery:DirectoryDescription
-discovery:DirectoryDescription rdf:type owl:Class ;
-	rdfs:label "Directory Description" ;
+### discovery:ThingDirectory
+discovery:ThingDirectory rdf:type owl:Class ;
+	rdfs:label "ThingDirectory" ;
 	rdfs:subClassOf td:Thing .
 
 #################################################################
@@ -74,4 +95,3 @@ discovery:DirectoryDescription rdf:type owl:Class ;
 #################################################################
 # General Axioms
 #################################################################
-