ontology: Move away from nao:lastModified to express ontology changes

Add a tracker:lastModified property that only applies to tracker:Ontology,
instead of using this such high-level property.

13 files changed, 15 insertions, 27 deletions

diff --git a/tests/functional-tests/ontology-changes.py b/tests/functional-tests/ontology-changes.py
index 753b1eb4a..8ccb662ab 100644
--- a/tests/functional-tests/ontology-changes.py
+++ b/tests/functional-tests/ontology-changes.py
@@ -153,9 +153,9 @@ class OntologyChangeTestTemplate (ut.TestCase):
         def get_ontology_date(ontology):
             with open(ontology, 'r') as f:
                 for line in f:
-                    if "nao:lastModified" in line:
+                    if "tracker:lastModified" in line:
                         getmodtime = re.compile(
-                            'nao:lastModified\ \"' + ISO9601_REGEX + '\"')
+                            'tracker:lastModified\ \"' + ISO9601_REGEX + '\"')
                         modtime_match = getmodtime.search(line)
 
                         if (modtime_match):
@@ -170,7 +170,7 @@ class OntologyChangeTestTemplate (ut.TestCase):
         second_date = get_ontology_date(
             self.ontology_path(second).joinpath("91-test.ontology"))
         if first_date >= second_date:
-            self.fail("nao:modifiedTime in '%s' is not more recent in the second ontology" % (
+            self.fail("tracker:lastModified in '%s' is not more recent in the second ontology" % (
                 "91-test.ontology"))
 
 
diff --git a/tests/functional-tests/test-ontologies/add-class/91-test.ontology b/tests/functional-tests/test-ontologies/add-class/91-test.ontology
index f957db4ca..16a5f5a7f 100644
--- a/tests/functional-tests/test-ontologies/add-class/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/add-class/91-test.ontology
@@ -2,7 +2,6 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
 @prefix test: <http://example.org/ns#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
 
@@ -16,7 +15,7 @@
 #     B   C
 #
 test: a tracker:Namespace, tracker:Ontology ;
-        nao:lastModified "2010-03-24T11:00:04Z" ;
+        tracker:lastModified "2010-03-24T11:00:04Z" ;
         tracker:prefix "test" .
 
 test:A a rdfs:Class .
diff --git a/tests/functional-tests/test-ontologies/add-domainIndex/91-test.ontology b/tests/functional-tests/test-ontologies/add-domainIndex/91-test.ontology
index 49bfefad4..e2d0b7eb2 100644
--- a/tests/functional-tests/test-ontologies/add-domainIndex/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/add-domainIndex/91-test.ontology
@@ -2,7 +2,6 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
 @prefix test: <http://example.org/ns#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
 
@@ -16,7 +15,7 @@
 #     B   C
 #
 test: a tracker:Namespace, tracker:Ontology ;
-        nao:lastModified "2010-03-24T11:00:04Z" ;
+        tracker:lastModified "2010-03-24T11:00:04Z" ;
         tracker:prefix "test" .
 
 test:A a rdfs:Class .
diff --git a/tests/functional-tests/test-ontologies/add-prop/91-test.ontology b/tests/functional-tests/test-ontologies/add-prop/91-test.ontology
index e0434739e..77a942877 100644
--- a/tests/functional-tests/test-ontologies/add-prop/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/add-prop/91-test.ontology
@@ -2,7 +2,6 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
 @prefix test: <http://example.org/ns#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
 
@@ -16,7 +15,7 @@
 #     B   C
 #
 test: a tracker:Namespace, tracker:Ontology ;
-        nao:lastModified "2010-03-24T11:00:04Z" ;
+        tracker:lastModified "2010-03-24T11:00:04Z" ;
         tracker:prefix "test" .
 
 test:A a rdfs:Class .
diff --git a/tests/functional-tests/test-ontologies/basic-future/91-test.ontology b/tests/functional-tests/test-ontologies/basic-future/91-test.ontology
index d965cb3c3..4762b5869 100644
--- a/tests/functional-tests/test-ontologies/basic-future/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/basic-future/91-test.ontology
@@ -2,7 +2,6 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
 @prefix test: <http://example.org/ns#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
 
@@ -16,7 +15,7 @@
 #     B   C
 #
 test: a tracker:Namespace, tracker:Ontology ;
-        nao:lastModified "2011-03-24T11:00:04Z" ;
+        tracker:lastModified "2011-03-24T11:00:04Z" ;
         tracker:prefix "test" .
 
 test:A a rdfs:Class .
diff --git a/tests/functional-tests/test-ontologies/basic/91-test.ontology b/tests/functional-tests/test-ontologies/basic/91-test.ontology
index 118248c84..d8a5177c5 100644
--- a/tests/functional-tests/test-ontologies/basic/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/basic/91-test.ontology
@@ -2,7 +2,6 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
 @prefix test: <http://example.org/ns#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
 
@@ -16,7 +15,7 @@
 #     B   C
 #
 test: a tracker:Namespace, tracker:Ontology ;
-        nao:lastModified "2010-03-23T11:00:04Z" ;
+        tracker:lastModified "2010-03-23T11:00:04Z" ;
         tracker:prefix "test" .
 
 test:A a rdfs:Class .
diff --git a/tests/functional-tests/test-ontologies/cardinality/91-test.ontology b/tests/functional-tests/test-ontologies/cardinality/91-test.ontology
index f3ebbd53a..91ae95aef 100644
--- a/tests/functional-tests/test-ontologies/cardinality/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/cardinality/91-test.ontology
@@ -2,7 +2,6 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
 @prefix test: <http://example.org/ns#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
 
@@ -16,7 +15,7 @@
 #     B   C
 #
 test: a tracker:Namespace, tracker:Ontology ;
-        nao:lastModified "2010-03-24T11:00:04Z" ;
+        tracker:lastModified "2010-03-24T11:00:04Z" ;
         tracker:prefix "test" .
 
 test:A a rdfs:Class .
diff --git a/tests/functional-tests/test-ontologies/indexed/91-test.ontology b/tests/functional-tests/test-ontologies/indexed/91-test.ontology
index 90a906165..7928a21ee 100644
--- a/tests/functional-tests/test-ontologies/indexed/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/indexed/91-test.ontology
@@ -2,7 +2,6 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
 @prefix test: <http://example.org/ns#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
 
@@ -16,7 +15,7 @@
 #     B   C
 #
 test: a tracker:Namespace, tracker:Ontology ;
-        nao:lastModified "2010-03-24T11:00:04Z" ;
+        tracker:lastModified "2010-03-24T11:00:04Z" ;
         tracker:prefix "test" .
 
 test:A a rdfs:Class .
diff --git a/tests/functional-tests/test-ontologies/notify/91-test.ontology b/tests/functional-tests/test-ontologies/notify/91-test.ontology
index b93f3e6a2..6b542c10f 100644
--- a/tests/functional-tests/test-ontologies/notify/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/notify/91-test.ontology
@@ -2,7 +2,6 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
 @prefix test: <http://example.org/ns#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
 
@@ -16,7 +15,7 @@
 #     B   C
 #
 test: a tracker:Namespace, tracker:Ontology ;
-        nao:lastModified "2010-03-24T11:00:04Z" ;
+        tracker:lastModified "2010-03-24T11:00:04Z" ;
         tracker:prefix "test" .
 
 # ***** TEST CHANGE ******
diff --git a/tests/functional-tests/test-ontologies/property-promotion/91-test.ontology b/tests/functional-tests/test-ontologies/property-promotion/91-test.ontology
index fa2245cd6..64cb8480e 100644
--- a/tests/functional-tests/test-ontologies/property-promotion/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/property-promotion/91-test.ontology
@@ -2,7 +2,6 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
 @prefix test: <http://example.org/ns#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
 
@@ -16,7 +15,7 @@
 #     B   C
 #
 test: a tracker:Namespace, tracker:Ontology ;
-        nao:lastModified "2010-03-24T11:00:04Z" ;
+        tracker:lastModified "2010-03-24T11:00:04Z" ;
         tracker:prefix "test" .
 
 test:A a rdfs:Class .
diff --git a/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology b/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology
index d77aa2876..479f1e636 100644
--- a/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/property-range-int-to-string/91-test.ontology
@@ -2,7 +2,6 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
 @prefix test: <http://example.org/ns#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
 
@@ -16,7 +15,7 @@
 #     B   C
 #
 test: a tracker:Namespace, tracker:Ontology ;
-        nao:lastModified "2010-03-24T11:00:04Z" ;
+        tracker:lastModified "2010-03-24T11:00:04Z" ;
         tracker:prefix "test" .
 
 test:A a rdfs:Class .
diff --git a/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology b/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology
index a5edcfac1..08c415595 100644
--- a/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/property-range-string-to-date/91-test.ontology
@@ -2,7 +2,6 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
 @prefix test: <http://example.org/ns#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
 
@@ -16,7 +15,7 @@
 #     B   C
 #
 test: a tracker:Namespace, tracker:Ontology ;
-        nao:lastModified "2010-03-24T11:00:04Z" ;
+        tracker:lastModified "2010-03-24T11:00:04Z" ;
         tracker:prefix "test" .
 
 test:A a rdfs:Class .
diff --git a/tests/functional-tests/test-ontologies/superclass-remove/91-test.ontology b/tests/functional-tests/test-ontologies/superclass-remove/91-test.ontology
index 3e8644efd..8a0ca5480 100644
--- a/tests/functional-tests/test-ontologies/superclass-remove/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/superclass-remove/91-test.ontology
@@ -2,7 +2,6 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
 @prefix test: <http://example.org/ns#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
 
@@ -16,7 +15,7 @@
 #     B   C
 #
 test: a tracker:Namespace, tracker:Ontology ;
-        nao:lastModified "2010-03-24T11:00:04Z" ;
+        tracker:lastModified "2010-03-24T11:00:04Z" ;
         tracker:prefix "test" .
 
 test:A a rdfs:Class .