[tracker/wip/carlosg/shuffle-nao] ontologies: Add tracker:deprecated to replace core uses of nao:deprecated



commit 94e9dd50819303ad145299da9b2fada09c373aa8
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Apr 10 14:49:01 2020 +0200

    ontologies: Add tracker:deprecated to replace core uses of nao:deprecated
    
    This is used to hint ontology bits as deprecated, and used in our doc tool,
    make it sure we don't rely on ontology bits that might even not be there.

 docs/tools/ttl_loader.c                |   7 +--
 src/ontologies/11-rdf.ontology         |   7 +++
 src/ontologies/nepomuk/30-nie.ontology |   3 +-
 src/ontologies/nepomuk/38-nmm.ontology |   3 +-
 src/ontologies/nepomuk/40-mlo.ontology | 101 ++++++++++++++++-----------------
 5 files changed, 62 insertions(+), 59 deletions(-)
---
diff --git a/docs/tools/ttl_loader.c b/docs/tools/ttl_loader.c
index b950feea5..6cd336d35 100644
--- a/docs/tools/ttl_loader.c
+++ b/docs/tools/ttl_loader.c
@@ -43,8 +43,7 @@
 #define TRACKER_FTS_INDEXED TRACKER_NS "fulltextIndexed"
 #define TRACKER_FTS_WEIGHT TRACKER_NS "weight"
 #define TRACKER_PREFIX TRACKER_NS "prefix"
-
-#define NAO_DEPRECATED "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#deprecated";
+#define TRACKER_DEPRECATED TRACKER_NS "deprecated"
 
 /* Ontology description */
 #define DSC_PREFIX "http://www.tracker-project.org/temp/dsc#";
@@ -266,9 +265,9 @@ load_in_memory (Ontology    *ontology,
                                                               g_strdup (turtle_subject));
                }
 
-       } else if (!g_strcmp0 (turtle_predicate, NAO_DEPRECATED)) {
+       } else if (!g_strcmp0 (turtle_predicate, TRACKER_DEPRECATED)) {
                /*
-                * X nao:deprecated true
+                * X tracker:deprecated true
                 *
                 * This can apply to classes OR properties OR
                 * namespaces!
diff --git a/src/ontologies/11-rdf.ontology b/src/ontologies/11-rdf.ontology
index 5ee5ad12b..026c0c9f3 100644
--- a/src/ontologies/11-rdf.ontology
+++ b/src/ontologies/11-rdf.ontology
@@ -170,3 +170,10 @@ tracker:writeback a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain rdf:Property ;
        rdfs:range xsd:boolean .
+
+tracker:deprecated a rdf:Property;
+       nrl:maxCardinality 1 ;
+       rdfs:domain rdfs:Resource;
+       rdfs:range xsd:boolean;
+       rdfs:label "deprecated";
+       rdfs:comment "If this property is assigned, the subject class, property, or resource, is deprecated 
and should not be used in production systems any longer. It may be removed without further notice." .
diff --git a/src/ontologies/nepomuk/30-nie.ontology b/src/ontologies/nepomuk/30-nie.ontology
index d64d3442b..f85e00b2a 100644
--- a/src/ontologies/nepomuk/30-nie.ontology
+++ b/src/ontologies/nepomuk/30-nie.ontology
@@ -1,6 +1,5 @@
 @prefix dc: <http://purl.org/dc/elements/1.1/> .
 @prefix nie: <http://www.semanticdesktop.org/ontologies/2007/01/19/nie#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@@ -170,7 +169,7 @@ nie:interpretedAs a rdf:Property ;
        rdfs:range nie:InformationElement .
 
 nie:isStoredAs a rdf:Property ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nrl:maxCardinality 1 ;
        rdfs:domain nie:InformationElement ;
        rdfs:range nie:DataObject .
diff --git a/src/ontologies/nepomuk/38-nmm.ontology b/src/ontologies/nepomuk/38-nmm.ontology
index a237ed987..4847b4244 100644
--- a/src/ontologies/nepomuk/38-nmm.ontology
+++ b/src/ontologies/nepomuk/38-nmm.ontology
@@ -1,7 +1,6 @@
 @prefix dc: <http://purl.org/dc/elements/1.1/> .
 @prefix nco: <http://www.semanticdesktop.org/ontologies/2007/03/22/nco#> .
 @prefix nfo: <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 @prefix nie: <http://www.semanticdesktop.org/ontologies/2007/01/19/nie#> .
 @prefix nmm: <http://www.tracker-project.org/temp/nmm#> .
 @prefix nrl: <http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#> .
@@ -192,7 +191,7 @@ nmm:albumTitle a rdf:Property ;
        nrl:maxCardinality 1 ;
        rdfs:domain nmm:MusicAlbum ;
        rdfs:range xsd:string ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        tracker:fulltextIndexed true ;
        tracker:weight 6 .
 
diff --git a/src/ontologies/nepomuk/40-mlo.ontology b/src/ontologies/nepomuk/40-mlo.ontology
index b3a1c9dec..acc8eb1e6 100644
--- a/src/ontologies/nepomuk/40-mlo.ontology
+++ b/src/ontologies/nepomuk/40-mlo.ontology
@@ -6,77 +6,76 @@
 @prefix nco: <http://www.semanticdesktop.org/ontologies/2007/03/22/nco#> .
 @prefix mlo: <http://www.tracker-project.org/temp/mlo#> .
 @prefix tracker: <http://www.tracker-project.org/ontologies/tracker#> .
-@prefix nao: <http://www.semanticdesktop.org/ontologies/2007/08/15/nao#> .
 
 mlo: a tracker:Namespace, tracker:Ontology ;
        tracker:prefix "mlo" ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        tracker:lastModified "2011-03-28T19:32:00Z" .
 
 mlo:GeoLocation a rdfs:Class ;
        rdfs:label "Location" ;
        rdfs:comment "A place in the space, can be defined by coordinates, text or box";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:subClassOf nie:InformationElement.
 
 mlo:GeoPoint a rdfs:Class ;
        rdfs:label "Point on the earth" ;
        rdfs:comment "The inherited properties from InformationElement can be used to add details." ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:subClassOf nie:InformationElement .
 
 mlo:GeoSphere a rdfs:Class ;
        rdfs:label "Spherical space" ;
        rdfs:comment "Point and radius to define an area in the space";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:subClassOf mlo:GeoPoint .
 
 mlo:GeoBoundingBox a rdfs:Class ;
        rdfs:label "Bounding box";
        rdfs:comment "Bounding box for a region in the space, defined with 2 points in 2D. We assume that the 
box is always aligned with parallels and meridians.";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:subClassOf nie:InformationElement .
 
 mlo:LocationBoundingBox a rdfs:Class ;
        rdfs:label "Box containing a relevant location (places that cannot be described in one concrete 
point)" ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:subClassOf mlo:GeoBoundingBox .
 
 mlo:Route a rdfs:Class ;
        rdfs:label "Minimum box containing all the points traversed in sequence." ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:subClassOf mlo:GeoBoundingBox .
 
 mlo:LandmarkCategory a rdfs:Class ;
        rdfs:label "Landmark category";
        rdfs:comment "Predefined set of instances for categories of landmarks";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:subClassOf nie:InformationElement.
 
 mlo:isRemovable a rdf:Property ;
        rdfs:label "Is removable";
        rdfs:comment "Flag to indicate if this instance is removable. This restriction is not enforced by 
tracker; it is API responsability to honor the value";
        rdfs:domain mlo:LandmarkCategory ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range xsd:boolean.
 
 mlo:Landmark a rdfs:Class ;
        rdfs:label "Point with special relevance for the user" ;
        rdfs:subClassOf nie:InformationElement ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:comment "Use the nie title, description, ... properties" .
 
 mlo:PointOfInterest a rdfs:Class ;
        rdfs:label "Use mlo:Landmark instead" ;
        rdfs:subClassOf mlo:Landmark ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:comment "Use the nie title, description, ...  properties".
 
 mlo:belongsToCategory a rdf:Property ;
        rdfs:label "Belongs to category";
        rdfs:comment "Relation of a landmark with a landmark category";
        rdfs:domain mlo:Landmark ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range mlo:LandmarkCategory .
 
 # Properties of GeoPoint
@@ -84,87 +83,87 @@ mlo:latitude a rdf:Property ;
        rdfs:label "Latitude";
        rdfs:comment "Positive values for the north hemisphere, negative for the south" ;
        rdfs:domain mlo:GeoPoint ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range  xsd:double .
 
 mlo:longitude a rdf:Property ;
        rdfs:label "Longitude" ;
        rdfs:comment "Positive to the East of the Greenwich meridian, negative to the West (following 
WGS-84)" ;
        rdfs:domain mlo:GeoPoint ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range  xsd:double .
 
 mlo:altitude a rdf:Property ;
        rdfs:label "Altitude" ;
        rdfs:comment "Altitude following WGS 84 reference";
        rdfs:domain mlo:GeoPoint ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range  xsd:double .
 
 mlo:timestamp a rdf:Property ;
        rdfs:label "Timestamp" ;
        rdfs:comment "Timestamp when the geopoint is referenced. Create subproperties for certain use cases" ;
        rdfs:domain mlo:GeoPoint ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range xsd:dateTime .
 
 # Properties of LocationBoundingBox
 mlo:boxSouthWestCorner a rdf:Property ;
        rdfs:label "South-west corner of the bounding box" ;
        rdfs:domain mlo:LocationBoundingBox ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range  mlo:GeoPoint.
 
 mlo:boxEastLimit a rdf:Property ;
        rdfs:label "Length of the box in the East direction" ;
        rdfs:domain mlo:LocationBoundingBox ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range mlo:GeoPoint.
 
 mlo:boxVerticalLimit a rdf:Property ;
        rdfs:label "Length of the box in the Up direction (height)" ;
        rdfs:domain mlo:LocationBoundingBox ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range mlo:GeoPoint.
 
 mlo:boxNorthLimit a rdf:Property ;
        rdfs:label "Length of the box in the North direction" ;
        rdfs:domain mlo:LocationBoundingBox ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range mlo:GeoPoint.
 
 mlo:bbNorthWest a rdf:Property ;
        rdfs:label "North west corner";
        rdfs:comment "North west corner of a bounding box. The GeoPoint is interpreted in 2D";
        rdfs:domain mlo:GeoBoundingBox ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range mlo:GeoPoint .
 
 mlo:bbSouthEast a rdf:Property ;
        rdfs:label "South east corner";
        rdfs:comment "South east corner of a bounding box. The GeoPoint is interpreted in 2D";
        rdfs:domain mlo:GeoBoundingBox ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range mlo:GeoPoint .
 
 # Properties of Route
 mlo:startTime a rdf:Property ;
        rdfs:label "Time when the first point in the route was saved" ;
        rdfs:domain mlo:Route ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range  xsd:dateTime .
 
 mlo:endTime a rdf:Property ;
        rdfs:label "Time when the last point in the route was saved" ;
        rdfs:domain mlo:Route ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range  xsd:dateTime .
 
 mlo:routeDetails a rdf:Property ;
        rdfs:label "Pointer to a file containing route details (e.g. KML file)." ;
        rdfs:comment "FIXME Domain can be resource if we handle map-files correctly in the ontology";
        rdfs:domain mlo:Route ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range  xsd:string .
 
 # Properties of GeoSphere
@@ -172,7 +171,7 @@ mlo:radius a rdf:Property ;
        rdfs:label "Radius";
        rdfs:comment "Radius from the center to define an area. Some applications can use it in 2D sense, 
making then a circle instead of a sphere" ;
        rdfs:domain mlo:GeoSphere ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range xsd:double .
 
 
@@ -183,7 +182,7 @@ mlo:location a rdf:Property ;
        rdfs:comment "This can be subclassed to add semantics" ;
        rdfs:domain nie:InformationElement ;
        tracker:indexed true ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range mlo:GeoLocation .
 
 # Properties of GeoLocation
@@ -192,7 +191,7 @@ mlo:asBoundingBox a rdf:Property ;
        rdfs:comment "Representation of the location as bounding box" ;
        tracker:indexed true ;
        rdfs:domain mlo:GeoLocation ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range mlo:GeoBoundingBox .
 
 mlo:asGeoPoint a rdf:Property ;
@@ -200,7 +199,7 @@ mlo:asGeoPoint a rdf:Property ;
        rdfs:comment "Representation of the location as geo point" ;
        tracker:indexed true ;
        rdfs:domain mlo:GeoLocation ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range mlo:GeoPoint .
 
 mlo:asPostalAddress a rdf:Property ;
@@ -208,35 +207,35 @@ mlo:asPostalAddress a rdf:Property ;
        rdfs:comment "Representation of the location as text address" ;
        tracker:indexed true ;
        rdfs:domain mlo:GeoLocation ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:range nco:PostalAddress .
 
 # TODO: These are ad-hoc added by Philip to support writeback of locations
 mlo:city a rdf:Property ;
        tracker:writeback true ;
        rdfs:label "City" ;
-       nao:deprecated true;
+       tracker:deprecated true;
        rdfs:domain mlo:GeoPoint ;
        rdfs:range  xsd:string .
 
 mlo:country a rdf:Property ;
        tracker:writeback true ;
        rdfs:label "Country" ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:domain mlo:GeoPoint ;
        rdfs:range  xsd:string .
 
 mlo:state a rdf:Property ;
        tracker:writeback true ;
        rdfs:label "State" ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:domain mlo:GeoPoint ;
        rdfs:range  xsd:string .
 
 mlo:address a rdf:Property ;
        tracker:writeback true ;
        rdfs:label "Address" ;
-       nao:deprecated true ;
+       tracker:deprecated true ;
        rdfs:domain mlo:GeoPoint ;
        rdfs:range  xsd:string .
 
@@ -244,7 +243,7 @@ mlo:address a rdf:Property ;
 mlo:poiLocation a rdf:Property ;
        rdfs:label "POI Location" ;
        rdfs:comment "Coordinates of the point (Use the mlo:location property inherited from IE" ;
-       nao:deprecated true;
+       tracker:deprecated true;
        rdfs:domain mlo:Landmark ;
        rdfs:range mlo:GeoPoint .
 
@@ -257,103 +256,103 @@ mlo:predefined-landmark-category-accommodation a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Accommodation";
        nie:identifier "3000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "Hotel, Camping site".
 
 mlo:predefined-landmark-category-business a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Business";
        nie:identifier "6000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "Bank, Factory, Office".
 
 mlo:predefined-landmark-category-communication a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Communication";
        nie:identifier "9000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "Internet Access Point, Public Telephone, Wireless LAN Hot Spot".
 
 mlo:predefined-landmark-category-educational-institute a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Educational institute";
        nie:identifier "12000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "School, College".
 
 mlo:predefined-landmark-category-entertainment a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Entertainment";
        nie:identifier "15000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "Amusement park, Cinema, Concert hall, Night club".
 
 mlo:predefined-landmark-category-food-beverage a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Food & Beverage";
        nie:identifier "18000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "Fast food, Restaurant, Café, Bar".
 
 mlo:predefined-landmark-category-geographical-area a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Geographical area";
        nie:identifier "21000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "City, City center, Town".
 
 mlo:predefined-landmark-category-outdoor-activities a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Outdoor activities";
        nie:identifier "24000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "Camping site, Fishing place, Hunting, National park, Playground".
 
 mlo:predefined-landmark-category-people a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "People";
        nie:identifier "27000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "My home, My friends home, Fathers summer cottage, Childs school".
 
 mlo:predefined-landmark-category-public-service a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Public service";
        nie:identifier "30000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "Tourist information office, Government office, Library, Post office, Hospital, 
Police ".
 
 mlo:predefined-landmark-category-religious-places a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Religious places";
        nie:identifier "33000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "Church, Mosque".
 
 mlo:predefined-landmark-category-shopping a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Shopping";
        nie:identifier "36000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "Market Place, Pharmacy, Shop, Shopping Center".
 
 mlo:predefined-landmark-category-sightseeing a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Sightseeing";
        nie:identifier "39000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "Monument, Mountain top, Museum".
 
 mlo:predefined-landmark-category-sports a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Sports";
        nie:identifier "42000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "Bowling, Golf course, Ice hockey hall, Stadium".
 
 mlo:predefined-landmark-category-transport a mlo:LandmarkCategory ;
        mlo:isRemovable false ;
        nie:title "Transport";
        nie:identifier "45000";
-       nao:deprecated true ;
+       tracker:deprecated true ;
        nie:description "Airport, Bus stop, Harbour, Railway Station, Rest area".


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]