[tracker/drop-graph: 2/2] Remove tracker:isAnnotation property



commit 9aa130b3e3098e59a71139d0ab1f42ae6e0224cb
Author: Jürg Billeter <j bitron ch>
Date:   Tue Dec 21 14:41:40 2010 +0100

    Remove tracker:isAnnotation property
    
    This was used only for DROP GRAPH support which has been removed.

 data/ontologies/11-rdf.ontology                    |   12 +----
 data/ontologies/30-nie.ontology                    |    1 -
 data/ontologies/31-nao.ontology                    |    3 +-
 docs/tools/ontology-graph.c                        |   12 ----
 src/libtracker-data/tracker-data-manager.c         |   55 ++------------------
 src/libtracker-data/tracker-property.c             |   27 ----------
 src/libtracker-data/tracker-property.h             |    3 -
 .../test-ontologies/add-class/11-rdf.ontology      |   12 +----
 .../add-domainIndex/11-rdf.ontology                |   12 +----
 .../test-ontologies/add-prop/11-rdf.ontology       |   12 +----
 .../test-ontologies/basic-future/11-rdf.ontology   |   12 +----
 .../test-ontologies/basic/11-rdf.ontology          |   12 +----
 .../test-ontologies/cardinality/11-rdf.ontology    |   12 +----
 .../test-ontologies/indexed/11-rdf.ontology        |   12 +----
 .../test-ontologies/notify/11-rdf.ontology         |   12 +----
 .../property-promotion/11-rdf.ontology             |   12 +----
 .../property-range-int-to-string/11-rdf.ontology   |   12 +----
 .../property-range-string-to-date/11-rdf.ontology  |   12 +----
 .../superclass-remove/11-rdf.ontology              |   12 +----
 utils/services/file-class.cache.test               |    1 -
 20 files changed, 31 insertions(+), 227 deletions(-)
---
diff --git a/data/ontologies/11-rdf.ontology b/data/ontologies/11-rdf.ontology
index c819e1f..8a50b04 100644
--- a/data/ontologies/11-rdf.ontology
+++ b/data/ontologies/11-rdf.ontology
@@ -105,12 +105,6 @@ tracker:transient a rdf:Property ;
 	rdfs:domain rdf:Property ;
 	rdfs:range xsd:boolean .
 
-tracker:isAnnotation a rdf:Property ;
-	rdfs:comment "The property is never embedded on physical files" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain rdf:Property ;
-	rdfs:range xsd:boolean .
-
 tracker:weight a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdf:Property ;
@@ -125,13 +119,11 @@ tracker:added a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
 	rdfs:range xsd:dateTime ;
-	tracker:indexed true ;
-	tracker:isAnnotation true .
+	tracker:indexed true .
 
 # implicitly updated modification time
 tracker:modified a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:integer ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:integer .
 
diff --git a/data/ontologies/30-nie.ontology b/data/ontologies/30-nie.ontology
index b794917..96ad191 100644
--- a/data/ontologies/30-nie.ontology
+++ b/data/ontologies/30-nie.ontology
@@ -268,7 +268,6 @@ nie:usageCounter a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain nie:InformationElement ;
 	rdfs:range xsd:integer ;
-	tracker:isAnnotation true ;
 	tracker:weight 3 .
 
 nie:url a rdf:Property ;
diff --git a/data/ontologies/31-nao.ontology b/data/ontologies/31-nao.ontology
index b695cf9..003e6e8 100644
--- a/data/ontologies/31-nao.ontology
+++ b/data/ontologies/31-nao.ontology
@@ -36,8 +36,7 @@ nao:hasTag a rdf:Property ;
 	rdfs:domain rdfs:Resource ;
 	rdfs:range rdfs:Resource ;
 	tracker:writeback true ;
-	tracker:indexed true ;
-	tracker:isAnnotation true .
+	tracker:indexed true .
 
 nao:identifier a rdf:Property ;
 	nrl:maxCardinality 1 ;
diff --git a/docs/tools/ontology-graph.c b/docs/tools/ontology-graph.c
index 0d93b30..c24bf10 100644
--- a/docs/tools/ontology-graph.c
+++ b/docs/tools/ontology-graph.c
@@ -252,18 +252,6 @@ load_ontology_file_from_path (const gchar	 *ontology_file)
 			if (g_strcmp0 (object, "true") == 0) {
 				tracker_property_set_transient (property, TRUE);
 			}
-		} else if (g_strcmp0 (predicate, TRACKER_PREFIX "isAnnotation") == 0) {
-			TrackerProperty *property;
-
-			property = tracker_ontologies_get_property_by_uri (subject);
-			if (property == NULL) {
-				g_critical ("%s: Unknown property %s", ontology_file, subject);
-				continue;
-			}
-
-			if (g_strcmp0 (object, "true") == 0) {
-				tracker_property_set_embedded (property, FALSE);
-			}
 		} else if (g_strcmp0 (predicate, TRACKER_PREFIX "fulltextIndexed") == 0) {
 			TrackerProperty *property;
 
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index ecc9776..b666eb8 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -1056,39 +1056,6 @@ tracker_data_ontology_load_statement (const gchar *ontology_path,
 		if (g_strcmp0 (object, "true") == 0) {
 			tracker_property_set_transient (property, TRUE);
 		}
-	} else if (g_strcmp0 (predicate, TRACKER_PREFIX "isAnnotation") == 0) {
-		TrackerProperty *property;
-		gboolean is_new;
-
-		property = tracker_ontologies_get_property_by_uri (subject);
-		if (property == NULL) {
-			g_critical ("%s: Unknown property %s", ontology_path, subject);
-			return;
-		}
-
-		is_new = tracker_property_get_is_new (property);
-		if (is_new != in_update) {
-			/* Detect unsupported ontology change (this needs a journal replay) */
-			if (in_update == TRUE && is_new == FALSE) {
-				if (check_unsupported_property_value_change (ontology_path,
-				                                             "tracker:isAnnotation",
-				                                             subject,
-				                                             predicate,
-				                                             object)) {
-					handle_unsupported_ontology_change (ontology_path,
-					                                    tracker_property_get_name (property),
-					                                    "tracker:isAnnotation",
-					                                    !tracker_property_get_embedded (property) ? "true" : "false",
-					                                    object,
-					                                    error);
-				}
-			}
-			return;
-		}
-
-		if (g_strcmp0 (object, "true") == 0) {
-			tracker_property_set_embedded (property, FALSE);
-		}
 	} else if (g_strcmp0 (predicate, TRACKER_PREFIX "fulltextIndexed") == 0) {
 		TrackerProperty *property;
 		gboolean is_new;
@@ -1783,7 +1750,6 @@ tracker_data_ontology_process_statement (const gchar *graph,
 	           g_strcmp0 (predicate, NRL_MAX_CARDINALITY) == 0           ||
 	           g_strcmp0 (predicate, TRACKER_PREFIX "indexed") == 0      ||
 	           g_strcmp0 (predicate, TRACKER_PREFIX "transient") == 0    ||
-	           g_strcmp0 (predicate, TRACKER_PREFIX "isAnnotation") == 0 ||
 	           g_strcmp0 (predicate, TRACKER_PREFIX "fulltextIndexed") == 0) {
 		TrackerProperty *prop;
 
@@ -2167,7 +2133,6 @@ db_get_static_data (TrackerDBInterface *iface)
 	                                              "\"tracker:fulltextIndexed\", "
 	                                              "\"tracker:fulltextNoLimit\", "
 	                                              "\"tracker:transient\", "
-	                                              "\"tracker:isAnnotation\", "
 	                                              "\"tracker:writeback\", "
 	                                              "(SELECT 1 FROM \"rdfs:Resource_rdf:type\" WHERE ID = \"rdf:Property\".ID AND "
 	                                              "\"rdf:type\" = (SELECT ID FROM Resource WHERE Uri = '" NRL_INVERSE_FUNCTIONAL_PROPERTY "')), "
@@ -2185,7 +2150,7 @@ db_get_static_data (TrackerDBInterface *iface)
 			TrackerProperty *property;
 			const gchar     *uri, *domain_uri, *range_uri, *secondary_index_uri, *default_value;
 			gboolean         multi_valued, indexed, fulltext_indexed, fulltext_no_limit;
-			gboolean         transient, annotation, is_inverse_functional_property;
+			gboolean         transient, is_inverse_functional_property;
 			gboolean         writeback;
 			gint             id;
 
@@ -2249,19 +2214,8 @@ db_get_static_data (TrackerDBInterface *iface)
 				transient = FALSE;
 			}
 
-			tracker_db_cursor_get_value (cursor, 10, &value);
-
-			if (G_VALUE_TYPE (&value) != 0) {
-				annotation = (g_value_get_int64 (&value) == 1);
-				g_value_unset (&value);
-			} else {
-				/* NULL */
-				annotation = FALSE;
-			}
-
-
 			/* tracker:writeback column */
-			tracker_db_cursor_get_value (cursor, 11, &value);
+			tracker_db_cursor_get_value (cursor, 10, &value);
 
 			if (G_VALUE_TYPE (&value) != 0) {
 				writeback = (g_value_get_int64 (&value) == 1);
@@ -2272,7 +2226,7 @@ db_get_static_data (TrackerDBInterface *iface)
 			}
 
 			/* NRL_INVERSE_FUNCTIONAL_PROPERTY column */
-			tracker_db_cursor_get_value (cursor, 12, &value);
+			tracker_db_cursor_get_value (cursor, 11, &value);
 
 			if (G_VALUE_TYPE (&value) != 0) {
 				is_inverse_functional_property = TRUE;
@@ -2282,7 +2236,7 @@ db_get_static_data (TrackerDBInterface *iface)
 				is_inverse_functional_property = FALSE;
 			}
 
-			default_value = tracker_db_cursor_get_string (cursor, 13, NULL);
+			default_value = tracker_db_cursor_get_string (cursor, 12, NULL);
 
 			tracker_property_set_is_new_domain_index (property, tracker_ontologies_get_class_by_uri (domain_uri), FALSE);
 			tracker_property_set_is_new (property, FALSE);
@@ -2304,7 +2258,6 @@ db_get_static_data (TrackerDBInterface *iface)
 
 			tracker_property_set_fulltext_indexed (property, fulltext_indexed);
 			tracker_property_set_fulltext_no_limit (property, fulltext_no_limit);
-			tracker_property_set_embedded (property, !annotation);
 			tracker_property_set_is_inverse_functional_property (property, is_inverse_functional_property);
 
 			/* super properties are only used in updates, never for queries */
diff --git a/src/libtracker-data/tracker-property.c b/src/libtracker-data/tracker-property.c
index 9a111a4..11ba6f1 100644
--- a/src/libtracker-data/tracker-property.c
+++ b/src/libtracker-data/tracker-property.c
@@ -55,7 +55,6 @@ struct _TrackerPropertyPrivate {
 	TrackerProperty *secondary_index;
 	gboolean       fulltext_indexed;
 	gboolean       fulltext_no_limit;
-	gboolean       embedded;
 	gboolean       multiple_values;
 	gboolean       last_multiple_values;
 	gboolean       transient;
@@ -133,7 +132,6 @@ tracker_property_init (TrackerProperty *property)
 
 	priv->id = 0;
 	priv->weight = 1;
-	priv->embedded = TRUE;
 	priv->transient = FALSE;
 	priv->multiple_values = TRUE;
 	priv->super_properties = g_array_new (TRUE, TRUE, sizeof (TrackerProperty *));
@@ -445,18 +443,6 @@ tracker_property_get_db_schema_changed (TrackerProperty *property)
 }
 
 gboolean
-tracker_property_get_embedded (TrackerProperty *property)
-{
-	TrackerPropertyPrivate *priv;
-
-	g_return_val_if_fail (TRACKER_IS_PROPERTY (property), FALSE);
-
-	priv = GET_PRIV (property);
-
-	return priv->embedded;
-}
-
-gboolean
 tracker_property_get_multiple_values (TrackerProperty *property)
 {
 	TrackerPropertyPrivate *priv;
@@ -852,19 +838,6 @@ tracker_property_set_fulltext_no_limit (TrackerProperty *property,
 }
 
 void
-tracker_property_set_embedded (TrackerProperty *property,
-                               gboolean         value)
-{
-	TrackerPropertyPrivate *priv;
-
-	g_return_if_fail (TRACKER_IS_PROPERTY (property));
-
-	priv = GET_PRIV (property);
-
-	priv->embedded = value;
-}
-
-void
 tracker_property_set_multiple_values (TrackerProperty *property,
                                       gboolean         value)
 {
diff --git a/src/libtracker-data/tracker-property.h b/src/libtracker-data/tracker-property.h
index d831938..f4c02d1 100644
--- a/src/libtracker-data/tracker-property.h
+++ b/src/libtracker-data/tracker-property.h
@@ -87,7 +87,6 @@ gboolean            tracker_property_get_indexed             (TrackerProperty
 TrackerProperty *   tracker_property_get_secondary_index     (TrackerProperty      *property);
 gboolean            tracker_property_get_fulltext_indexed    (TrackerProperty      *property);
 gboolean            tracker_property_get_fulltext_no_limit   (TrackerProperty      *property);
-gboolean            tracker_property_get_embedded            (TrackerProperty      *property);
 gboolean            tracker_property_get_multiple_values     (TrackerProperty      *property);
 gboolean            tracker_property_get_last_multiple_values(TrackerProperty      *property);
 gboolean            tracker_property_get_transient           (TrackerProperty      *property);
@@ -123,8 +122,6 @@ void                tracker_property_set_fulltext_indexed    (TrackerProperty
                                                               gboolean              value);
 void                tracker_property_set_fulltext_no_limit   (TrackerProperty      *property,
                                                               gboolean              value);
-void                tracker_property_set_embedded            (TrackerProperty      *property,
-                                                              gboolean              value);
 void                tracker_property_set_multiple_values     (TrackerProperty      *property,
                                                               gboolean              value);
 void                tracker_property_set_last_multiple_values(TrackerProperty      *property,
diff --git a/tests/functional-tests/test-ontologies/add-class/11-rdf.ontology b/tests/functional-tests/test-ontologies/add-class/11-rdf.ontology
index 7a485a9..59b7b4d 100644
--- a/tests/functional-tests/test-ontologies/add-class/11-rdf.ontology
+++ b/tests/functional-tests/test-ontologies/add-class/11-rdf.ontology
@@ -105,12 +105,6 @@ tracker:transient a rdf:Property ;
 	rdfs:domain rdf:Property ;
 	rdfs:range xsd:boolean .
 
-tracker:isAnnotation a rdf:Property ;
-	rdfs:comment "The property is never embedded on physical files" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain rdf:Property ;
-	rdfs:range xsd:boolean .
-
 tracker:weight a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdf:Property ;
@@ -124,13 +118,11 @@ tracker:defaultValue a rdf:Property ;
 tracker:added a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:dateTime ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:dateTime .
 
 # implicitly updated modification time
 tracker:modified a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:integer ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:integer .
 
diff --git a/tests/functional-tests/test-ontologies/add-domainIndex/11-rdf.ontology b/tests/functional-tests/test-ontologies/add-domainIndex/11-rdf.ontology
index 7a485a9..59b7b4d 100644
--- a/tests/functional-tests/test-ontologies/add-domainIndex/11-rdf.ontology
+++ b/tests/functional-tests/test-ontologies/add-domainIndex/11-rdf.ontology
@@ -105,12 +105,6 @@ tracker:transient a rdf:Property ;
 	rdfs:domain rdf:Property ;
 	rdfs:range xsd:boolean .
 
-tracker:isAnnotation a rdf:Property ;
-	rdfs:comment "The property is never embedded on physical files" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain rdf:Property ;
-	rdfs:range xsd:boolean .
-
 tracker:weight a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdf:Property ;
@@ -124,13 +118,11 @@ tracker:defaultValue a rdf:Property ;
 tracker:added a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:dateTime ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:dateTime .
 
 # implicitly updated modification time
 tracker:modified a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:integer ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:integer .
 
diff --git a/tests/functional-tests/test-ontologies/add-prop/11-rdf.ontology b/tests/functional-tests/test-ontologies/add-prop/11-rdf.ontology
index 7a485a9..59b7b4d 100644
--- a/tests/functional-tests/test-ontologies/add-prop/11-rdf.ontology
+++ b/tests/functional-tests/test-ontologies/add-prop/11-rdf.ontology
@@ -105,12 +105,6 @@ tracker:transient a rdf:Property ;
 	rdfs:domain rdf:Property ;
 	rdfs:range xsd:boolean .
 
-tracker:isAnnotation a rdf:Property ;
-	rdfs:comment "The property is never embedded on physical files" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain rdf:Property ;
-	rdfs:range xsd:boolean .
-
 tracker:weight a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdf:Property ;
@@ -124,13 +118,11 @@ tracker:defaultValue a rdf:Property ;
 tracker:added a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:dateTime ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:dateTime .
 
 # implicitly updated modification time
 tracker:modified a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:integer ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:integer .
 
diff --git a/tests/functional-tests/test-ontologies/basic-future/11-rdf.ontology b/tests/functional-tests/test-ontologies/basic-future/11-rdf.ontology
index 7a485a9..59b7b4d 100644
--- a/tests/functional-tests/test-ontologies/basic-future/11-rdf.ontology
+++ b/tests/functional-tests/test-ontologies/basic-future/11-rdf.ontology
@@ -105,12 +105,6 @@ tracker:transient a rdf:Property ;
 	rdfs:domain rdf:Property ;
 	rdfs:range xsd:boolean .
 
-tracker:isAnnotation a rdf:Property ;
-	rdfs:comment "The property is never embedded on physical files" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain rdf:Property ;
-	rdfs:range xsd:boolean .
-
 tracker:weight a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdf:Property ;
@@ -124,13 +118,11 @@ tracker:defaultValue a rdf:Property ;
 tracker:added a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:dateTime ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:dateTime .
 
 # implicitly updated modification time
 tracker:modified a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:integer ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:integer .
 
diff --git a/tests/functional-tests/test-ontologies/basic/11-rdf.ontology b/tests/functional-tests/test-ontologies/basic/11-rdf.ontology
index 7a485a9..59b7b4d 100644
--- a/tests/functional-tests/test-ontologies/basic/11-rdf.ontology
+++ b/tests/functional-tests/test-ontologies/basic/11-rdf.ontology
@@ -105,12 +105,6 @@ tracker:transient a rdf:Property ;
 	rdfs:domain rdf:Property ;
 	rdfs:range xsd:boolean .
 
-tracker:isAnnotation a rdf:Property ;
-	rdfs:comment "The property is never embedded on physical files" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain rdf:Property ;
-	rdfs:range xsd:boolean .
-
 tracker:weight a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdf:Property ;
@@ -124,13 +118,11 @@ tracker:defaultValue a rdf:Property ;
 tracker:added a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:dateTime ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:dateTime .
 
 # implicitly updated modification time
 tracker:modified a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:integer ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:integer .
 
diff --git a/tests/functional-tests/test-ontologies/cardinality/11-rdf.ontology b/tests/functional-tests/test-ontologies/cardinality/11-rdf.ontology
index 7a485a9..59b7b4d 100644
--- a/tests/functional-tests/test-ontologies/cardinality/11-rdf.ontology
+++ b/tests/functional-tests/test-ontologies/cardinality/11-rdf.ontology
@@ -105,12 +105,6 @@ tracker:transient a rdf:Property ;
 	rdfs:domain rdf:Property ;
 	rdfs:range xsd:boolean .
 
-tracker:isAnnotation a rdf:Property ;
-	rdfs:comment "The property is never embedded on physical files" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain rdf:Property ;
-	rdfs:range xsd:boolean .
-
 tracker:weight a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdf:Property ;
@@ -124,13 +118,11 @@ tracker:defaultValue a rdf:Property ;
 tracker:added a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:dateTime ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:dateTime .
 
 # implicitly updated modification time
 tracker:modified a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:integer ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:integer .
 
diff --git a/tests/functional-tests/test-ontologies/indexed/11-rdf.ontology b/tests/functional-tests/test-ontologies/indexed/11-rdf.ontology
index 7a485a9..59b7b4d 100644
--- a/tests/functional-tests/test-ontologies/indexed/11-rdf.ontology
+++ b/tests/functional-tests/test-ontologies/indexed/11-rdf.ontology
@@ -105,12 +105,6 @@ tracker:transient a rdf:Property ;
 	rdfs:domain rdf:Property ;
 	rdfs:range xsd:boolean .
 
-tracker:isAnnotation a rdf:Property ;
-	rdfs:comment "The property is never embedded on physical files" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain rdf:Property ;
-	rdfs:range xsd:boolean .
-
 tracker:weight a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdf:Property ;
@@ -124,13 +118,11 @@ tracker:defaultValue a rdf:Property ;
 tracker:added a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:dateTime ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:dateTime .
 
 # implicitly updated modification time
 tracker:modified a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:integer ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:integer .
 
diff --git a/tests/functional-tests/test-ontologies/notify/11-rdf.ontology b/tests/functional-tests/test-ontologies/notify/11-rdf.ontology
index 7a485a9..59b7b4d 100644
--- a/tests/functional-tests/test-ontologies/notify/11-rdf.ontology
+++ b/tests/functional-tests/test-ontologies/notify/11-rdf.ontology
@@ -105,12 +105,6 @@ tracker:transient a rdf:Property ;
 	rdfs:domain rdf:Property ;
 	rdfs:range xsd:boolean .
 
-tracker:isAnnotation a rdf:Property ;
-	rdfs:comment "The property is never embedded on physical files" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain rdf:Property ;
-	rdfs:range xsd:boolean .
-
 tracker:weight a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdf:Property ;
@@ -124,13 +118,11 @@ tracker:defaultValue a rdf:Property ;
 tracker:added a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:dateTime ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:dateTime .
 
 # implicitly updated modification time
 tracker:modified a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:integer ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:integer .
 
diff --git a/tests/functional-tests/test-ontologies/property-promotion/11-rdf.ontology b/tests/functional-tests/test-ontologies/property-promotion/11-rdf.ontology
index 7a485a9..59b7b4d 100644
--- a/tests/functional-tests/test-ontologies/property-promotion/11-rdf.ontology
+++ b/tests/functional-tests/test-ontologies/property-promotion/11-rdf.ontology
@@ -105,12 +105,6 @@ tracker:transient a rdf:Property ;
 	rdfs:domain rdf:Property ;
 	rdfs:range xsd:boolean .
 
-tracker:isAnnotation a rdf:Property ;
-	rdfs:comment "The property is never embedded on physical files" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain rdf:Property ;
-	rdfs:range xsd:boolean .
-
 tracker:weight a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdf:Property ;
@@ -124,13 +118,11 @@ tracker:defaultValue a rdf:Property ;
 tracker:added a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:dateTime ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:dateTime .
 
 # implicitly updated modification time
 tracker:modified a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:integer ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:integer .
 
diff --git a/tests/functional-tests/test-ontologies/property-range-int-to-string/11-rdf.ontology b/tests/functional-tests/test-ontologies/property-range-int-to-string/11-rdf.ontology
index 7a485a9..59b7b4d 100644
--- a/tests/functional-tests/test-ontologies/property-range-int-to-string/11-rdf.ontology
+++ b/tests/functional-tests/test-ontologies/property-range-int-to-string/11-rdf.ontology
@@ -105,12 +105,6 @@ tracker:transient a rdf:Property ;
 	rdfs:domain rdf:Property ;
 	rdfs:range xsd:boolean .
 
-tracker:isAnnotation a rdf:Property ;
-	rdfs:comment "The property is never embedded on physical files" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain rdf:Property ;
-	rdfs:range xsd:boolean .
-
 tracker:weight a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdf:Property ;
@@ -124,13 +118,11 @@ tracker:defaultValue a rdf:Property ;
 tracker:added a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:dateTime ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:dateTime .
 
 # implicitly updated modification time
 tracker:modified a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:integer ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:integer .
 
diff --git a/tests/functional-tests/test-ontologies/property-range-string-to-date/11-rdf.ontology b/tests/functional-tests/test-ontologies/property-range-string-to-date/11-rdf.ontology
index 7a485a9..59b7b4d 100644
--- a/tests/functional-tests/test-ontologies/property-range-string-to-date/11-rdf.ontology
+++ b/tests/functional-tests/test-ontologies/property-range-string-to-date/11-rdf.ontology
@@ -105,12 +105,6 @@ tracker:transient a rdf:Property ;
 	rdfs:domain rdf:Property ;
 	rdfs:range xsd:boolean .
 
-tracker:isAnnotation a rdf:Property ;
-	rdfs:comment "The property is never embedded on physical files" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain rdf:Property ;
-	rdfs:range xsd:boolean .
-
 tracker:weight a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdf:Property ;
@@ -124,13 +118,11 @@ tracker:defaultValue a rdf:Property ;
 tracker:added a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:dateTime ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:dateTime .
 
 # implicitly updated modification time
 tracker:modified a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:integer ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:integer .
 
diff --git a/tests/functional-tests/test-ontologies/superclass-remove/11-rdf.ontology b/tests/functional-tests/test-ontologies/superclass-remove/11-rdf.ontology
index 7a485a9..59b7b4d 100644
--- a/tests/functional-tests/test-ontologies/superclass-remove/11-rdf.ontology
+++ b/tests/functional-tests/test-ontologies/superclass-remove/11-rdf.ontology
@@ -105,12 +105,6 @@ tracker:transient a rdf:Property ;
 	rdfs:domain rdf:Property ;
 	rdfs:range xsd:boolean .
 
-tracker:isAnnotation a rdf:Property ;
-	rdfs:comment "The property is never embedded on physical files" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain rdf:Property ;
-	rdfs:range xsd:boolean .
-
 tracker:weight a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdf:Property ;
@@ -124,13 +118,11 @@ tracker:defaultValue a rdf:Property ;
 tracker:added a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:dateTime ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:dateTime .
 
 # implicitly updated modification time
 tracker:modified a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain rdfs:Resource ;
-	rdfs:range xsd:integer ;
-	tracker:isAnnotation true .
+	rdfs:range xsd:integer .
 
diff --git a/utils/services/file-class.cache.test b/utils/services/file-class.cache.test
index 08e4576..6dce42d 100644
--- a/utils/services/file-class.cache.test
+++ b/utils/services/file-class.cache.test
@@ -652,7 +652,6 @@ rdf tracker:prefix
 rdf tracker:indexed
 rdf tracker:fulltextIndexed
 rdf tracker:transient
-rdf tracker:isAnnotation
 rdf tracker:weight
 rdf tracker:added
 rdf tracker:modified



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