NMO: Remove nmo:Mailbox and nmo:plainTextMessageContent

They were deprecated 13 months ago.

12 files changed, 9 insertions, 29 deletions

diff --git a/data/ontologies/34-nmo.ontology b/data/ontologies/34-nmo.ontology
index c53b9aa86..773f426ff 100644
--- a/data/ontologies/34-nmo.ontology
+++ b/data/ontologies/34-nmo.ontology
@@ -12,7 +12,7 @@
 
 nmo: a tracker:Namespace, tracker:Ontology ;
 	tracker:prefix "nmo" ;
-	nao:lastModified "2011-01-20T12:45:00Z" .
+	nao:lastModified "2011-01-25T13:30:00Z" .
 
 # FIXME Extension requested in Nepomuk
 nmo:MimePart a rdfs:Class ;
@@ -54,11 +54,6 @@ nmo:Attachment a rdfs:Class ;
 nmo:MailAccount a rdfs:Class ;
 	rdfs:subClassOf nie:InformationElement .
 
-# FIXME Remove this one next release
-nmo:Mailbox a rdfs:Class ;
-	nao:deprecated true ;
-	rdfs:subClassOf nmo:MailAccount .
-
 nmo:MailboxDataObject a rdfs:Class ;
 	rdfs:subClassOf nie:DataObject .
 
@@ -177,13 +172,6 @@ nmo:isEmergency a rdf:Property ;
 	rdfs:domain nmo:Message ;
 	rdfs:range xsd:boolean .
 
-nmo:plainTextMessageContent a rdf:Property ;
-	rdfs:comment "nmo:plainTextMessageContent is deprecated, use nie:plainTextContent instead" ;
-	nao:deprecated true ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain nmo:Message ;
-	rdfs:range xsd:string .
-
 nmo:htmlMessageContent a rdf:Property ;
 	nrl:maxCardinality 1 ;
 	rdfs:domain nmo:Message ;
diff --git a/examples/rss-reader/signaler.py b/examples/rss-reader/signaler.py
index b729bff4d..5816f2235 100755
--- a/examples/rss-reader/signaler.py
+++ b/examples/rss-reader/signaler.py
@@ -42,7 +42,7 @@ INSERT {
 <%s> a mfo:FeedMessage ;
  nie:contentLastModified "%s" ;
  nmo:communicationChannel <http://maemo.org/news/planet-maemo/atom.xml>;
- nmo:plainTextMessageContent "%s" ;
+ nie:plainTextContent "%s" ;
  nie:title "%s".
  }
 """
diff --git a/examples/rss-reader/tracker_backend.py b/examples/rss-reader/tracker_backend.py
index 33c1b1cae..35d8f715a 100644
--- a/examples/rss-reader/tracker_backend.py
+++ b/examples/rss-reader/tracker_backend.py
@@ -66,7 +66,7 @@ QUERY_FOR_URI = """
 
 QUERY_FOR_TEXT = """
     SELECT ?text WHERE {
-    <%s> nmo:plainTextMessageContent ?text .
+    <%s> nie:plainTextContent ?text .
     }
 """
 
diff --git a/src/miners/rss/tracker-miner-rss.c b/src/miners/rss/tracker-miner-rss.c
index 7f8e1d53e..fb297a75e 100644
--- a/src/miners/rss/tracker-miner-rss.c
+++ b/src/miners/rss/tracker-miner-rss.c
@@ -346,7 +346,7 @@ item_verify_reply_cb (GObject      *source_object,
 
 	tmp_string = feed_item_get_description (item);
 	if (tmp_string != NULL) {
-		tracker_sparql_builder_predicate (sparql, "nmo:plainTextMessageContent");
+		tracker_sparql_builder_predicate (sparql, "nie:plainTextContent");
 		tracker_sparql_builder_object_unvalidated (sparql, tmp_string);
 	}
 
diff --git a/tests/functional-tests/01-insertion.py b/tests/functional-tests/01-insertion.py
index 22d926f2a..48468be84 100755
--- a/tests/functional-tests/01-insertion.py
+++ b/tests/functional-tests/01-insertion.py
@@ -574,7 +574,7 @@ class TrackerStorePhoneNumberTest (CommonTrackerStoreTest):
                     <test://test_phone_1/message> a nmo:Message ; 
                          nmo:from [a nco:Contact ; nco:hasPhoneNumber <tel:123456789>];
                          nmo:receivedDate '2010-01-02T10:13:00Z' ; 
-                         nmo:plainTextMessageContent 'hello'
+                         nie:plainTextContent 'hello'
                 }
                 """
                 self.tracker.update (INSERT_MESSAGE)
diff --git a/tests/libtracker-data/nmo/Makefile.am b/tests/libtracker-data/nmo/Makefile.am
index 7ab7166df..c4cbc523b 100644
--- a/tests/libtracker-data/nmo/Makefile.am
+++ b/tests/libtracker-data/nmo/Makefile.am
@@ -31,6 +31,4 @@ EXTRA_DIST =                                           \
 	filter-messageid-1.out                         \
 	filter-messageid-1.rq                          \
 	filter-messagesubject-1.out                    \
-	filter-messagesubject-1.rq                     \
-	filter-plaintextmessagecontent-1.out           \
-	filter-plaintextmessagecontent-1.rq
+	filter-messagesubject-1.rq
diff --git a/tests/libtracker-data/nmo/data-1.ttl b/tests/libtracker-data/nmo/data-1.ttl
index 7947476af..b74e35e9d 100644
--- a/tests/libtracker-data/nmo/data-1.ttl
+++ b/tests/libtracker-data/nmo/data-1.ttl
@@ -25,7 +25,7 @@ _:a1 a nmo:Message .
 
 _:a1 nmo:messageSubject "stringly data for nmo:messageSubject" .
 _:a1 nmo:isRead "stringly data for nmo:isRead" .
-_:a1 nmo:plainTextMessageContent "stringly data for nmo:plainTextMessageContent" .
+_:a1 nie:plainTextContent "stringly data for nie:plainTextContent" .
 _:a1 nmo:messageId "stringly data for nmo:messageId" .
 
 _:a2 a nmo:MailAccount .
diff --git a/tests/libtracker-data/nmo/filter-plaintextmessagecontent-1.out b/tests/libtracker-data/nmo/filter-plaintextmessagecontent-1.out
deleted file mode 100644
index 69fef770a..000000000
--- a/tests/libtracker-data/nmo/filter-plaintextmessagecontent-1.out
+++ /dev/null
@@ -1 +0,0 @@
-"stringly data for nmo:plainTextMessageContent"
diff --git a/tests/libtracker-data/nmo/filter-plaintextmessagecontent-1.rq b/tests/libtracker-data/nmo/filter-plaintextmessagecontent-1.rq
deleted file mode 100644
index 325349efc..000000000
--- a/tests/libtracker-data/nmo/filter-plaintextmessagecontent-1.rq
+++ /dev/null
@@ -1,3 +0,0 @@
-SELECT ?plainTextMessageContent
-WHERE { ?x nmo:plainTextMessageContent ?plainTextMessageContent }
-ORDER BY ?plainTextMessageContent
diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/libtracker-data/tracker-ontology-test.c
index 66784908d..cb0fe1379 100644
--- a/tests/libtracker-data/tracker-ontology-test.c
+++ b/tests/libtracker-data/tracker-ontology-test.c
@@ -78,7 +78,6 @@ const TestInfo nmo_tests[] = {
 	{ "nmo/filter-isrecent-1", "nmo/data-1" },
 	{ "nmo/filter-messageid-1", "nmo/data-1" },
 	{ "nmo/filter-messagesubject-1", "nmo/data-1" },
-	{ "nmo/filter-plaintextmessagecontent-1", "nmo/data-1" },
 	{ NULL }
 };
 
diff --git a/utils/data-generators/deprecated/generate-data-for-contact-messages.py b/utils/data-generators/deprecated/generate-data-for-contact-messages.py
index 3586b9db5..8ff7bed7b 100755
--- a/utils/data-generators/deprecated/generate-data-for-contact-messages.py
+++ b/utils/data-generators/deprecated/generate-data-for-contact-messages.py
@@ -118,7 +118,7 @@ def generateSMS (many):
         sys.stdout.write('\tnmo:receivedDate "' + getPseudoRandomDate () + '";\n')
         if (random.randint(0, 4) > 3):
             sys.stdout.write ('\tnao:hasTag [a nao:Tag ; nao:prefLabel ' +  getRandomTag () +'];\n')
-        sys.stdout.write('\tnmo:plainTextMessageContent "' + str.replace(gen_data.create_paragraphs(1, 5, 8), "\n", "") + '".\n')
+        sys.stdout.write('\tnie:plainTextContent "' + str.replace(gen_data.create_paragraphs(1, 5, 8), "\n", "") + '".\n')
         sys.stdout.write('\n')
 
 def generateEmailAddress():
@@ -164,7 +164,7 @@ def generateEmail(sys, gen_data, str, random):
         sys.stdout.write ('\tnao:hasTag [a nao:Tag ; nao:prefLabel ' +  getRandomTag () +'];\n')
 
     sys.stdout.write('\tnmo:messageSubject "' + str.replace(gen_data.create_paragraphs(1, 2, 2), "\n", "") + '";\n')
-    sys.stdout.write('\tnmo:plainTextMessageContent "' + str.replace(gen_data.create_paragraphs(1, 2, 3), "\n", "") + '".\n')
+    sys.stdout.write('\tnie:plainTextContent "' + str.replace(gen_data.create_paragraphs(1, 2, 3), "\n", "") + '".\n')
 
 # BEGIN CREATING.
 if (len(sys.argv) < 2):
diff --git a/utils/services/file-class.cache.test b/utils/services/file-class.cache.test
index b6de53309..0fee9763c 100644
--- a/utils/services/file-class.cache.test
+++ b/utils/services/file-class.cache.test
@@ -720,7 +720,6 @@ nmo nmo:isDeleted
 nmo nmo:isDraft
 nmo nmo:isRecent
 nmo nmo:isRead
-nmo nmo:plainTextMessageContent
 nmo nmo:htmlMessageContent
 nmo nmo:references
 nmo nmo:inReplyTo