Merge branch 'sam/ontology-urls' into 'master'

Update ontology URLs for 3.0

Closes #104 and #162

See merge request GNOME/tracker!222

14 files changed, 29 insertions, 29 deletions

diff --git a/tests/functional-tests/group-concat.py b/tests/functional-tests/group-concat.py
index 7cb2e907e..5e3f11d26 100644
--- a/tests/functional-tests/group-concat.py
+++ b/tests/functional-tests/group-concat.py
@@ -73,9 +73,9 @@ class TestGroupConcat (fixtures.TrackerSparqlDirectTest):
         instances = results[0][1].split('|')
         assert len(instances) == 3
 
-        TEXT_CHAT = "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#im-capability-text-chat"
-        MEDIA_CALLS = "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#im-capability-media-calls"
-        FILE_TRANSFERS = "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#im-capability-file-transfers"
+        TEXT_CHAT = "http://tracker.api.gnome.org/ontology/v3/nco#im-capability-text-chat"
+        MEDIA_CALLS = "http://tracker.api.gnome.org/ontology/v3/nco#im-capability-media-calls"
+        FILE_TRANSFERS = "http://tracker.api.gnome.org/ontology/v3/nco#im-capability-file-transfers"
         assert TEXT_CHAT in instances
         assert MEDIA_CALLS in instances
         assert FILE_TRANSFERS in instances
diff --git a/tests/functional-tests/test-data/test-movie.ttl b/tests/functional-tests/test-data/test-movie.ttl
index dc7aabf67..6e2483341 100644
--- a/tests/functional-tests/test-data/test-movie.ttl
+++ b/tests/functional-tests/test-data/test-movie.ttl
@@ -1,5 +1,5 @@
-@prefix nmm: <http://www.tracker-project.org/temp/nmm#> .
-@prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
+@prefix nmm: <http://tracker.api.gnome.org/ontology/v3/nmm#> .
+@prefix nfo: <http://tracker.api.gnome.org/ontology/v3/nfo#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 
 _:3 a nfo:FileHash ;
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 16a5f5a7f..a4f231340 100644
--- a/tests/functional-tests/test-ontologies/add-class/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/add-class/91-test.ontology
@@ -1,9 +1,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
 #
 # Note: If you modify this ontology remember to replicate the changes in the other
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 e2d0b7eb2..0d224f49a 100644
--- a/tests/functional-tests/test-ontologies/add-domainIndex/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/add-domainIndex/91-test.ontology
@@ -1,9 +1,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
 #
 # Note: If you modify this ontology remember to replicate the changes in the other
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 77a942877..72fde9361 100644
--- a/tests/functional-tests/test-ontologies/add-prop/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/add-prop/91-test.ontology
@@ -1,9 +1,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
 #
 # Note: If you modify this ontology remember to replicate the changes in the other
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 4762b5869..6dda3b2a1 100644
--- a/tests/functional-tests/test-ontologies/basic-future/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/basic-future/91-test.ontology
@@ -1,9 +1,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
 #
 # Note: If you modify this ontology remember to replicate the changes in the other
diff --git a/tests/functional-tests/test-ontologies/basic/91-test.ontology b/tests/functional-tests/test-ontologies/basic/91-test.ontology
index d8a5177c5..cae343eab 100644
--- a/tests/functional-tests/test-ontologies/basic/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/basic/91-test.ontology
@@ -1,9 +1,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
 #
 # Note: If you modify this ontology remember to replicate the changes in the other
diff --git a/tests/functional-tests/test-ontologies/cardinality/91-test.ontology b/tests/functional-tests/test-ontologies/cardinality/91-test.ontology
index 91ae95aef..08e8b8faf 100644
--- a/tests/functional-tests/test-ontologies/cardinality/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/cardinality/91-test.ontology
@@ -1,9 +1,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
 #
 # Note: If you modify this ontology remember to replicate the changes in the other
diff --git a/tests/functional-tests/test-ontologies/indexed/91-test.ontology b/tests/functional-tests/test-ontologies/indexed/91-test.ontology
index 7928a21ee..8b1b1a65b 100644
--- a/tests/functional-tests/test-ontologies/indexed/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/indexed/91-test.ontology
@@ -1,9 +1,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
 #
 # Note: If you modify this ontology remember to replicate the changes in the other
diff --git a/tests/functional-tests/test-ontologies/notify/91-test.ontology b/tests/functional-tests/test-ontologies/notify/91-test.ontology
index 6b542c10f..d60e3902c 100644
--- a/tests/functional-tests/test-ontologies/notify/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/notify/91-test.ontology
@@ -1,9 +1,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
 #
 # Note: If you modify this ontology remember to replicate the changes in the other
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 64cb8480e..d3442e9e9 100644
--- a/tests/functional-tests/test-ontologies/property-promotion/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/property-promotion/91-test.ontology
@@ -1,9 +1,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
 #
 # Note: If you modify this ontology remember to replicate the changes in the other
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 479f1e636..56fc79da2 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
@@ -1,9 +1,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
 #
 # Note: If you modify this ontology remember to replicate the changes in the other
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 08c415595..faa57b6c3 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
@@ -1,9 +1,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
 #
 # Note: If you modify this ontology remember to replicate the changes in the other
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 8a0ca5480..3796ad57c 100644
--- a/tests/functional-tests/test-ontologies/superclass-remove/91-test.ontology
+++ b/tests/functional-tests/test-ontologies/superclass-remove/91-test.ontology
@@ -1,9 +1,9 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
+@prefix tracker: <http://tracker.api.gnome.org/ontology/v3/tracker#> .
 @prefix test: <http://example.org/ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
+@prefix nrl: <http://tracker.api.gnome.org/ontology/v3/nrl#> .
 
 #
 # Note: If you modify this ontology remember to replicate the changes in the other