[tracker] NMO: Remove deprecated SMS folder class, properties, and instances

[Jürg Billeter <juergbi src gnome org>]

commit fea4307f365a75c6482d936d23036044d71719f1
Author: Jürg Billeter <j bitron ch>
Date:   Tue Jan 25 15:09:44 2011 +0100

    NMO: Remove deprecated SMS folder class, properties, and instances
    
    They were deprecated 3 months ago.

 data/ontologies/34-nmo.ontology                   |   66 +--------------------
 tests/functional-tests/performance-tc-modified.py |    2 +-
 tests/functional-tests/performance-tc.py          |    2 +-
 tests/libtracker-data/nie/filter-identifier-1.out |    5 --
 tests/libtracker-data/nie/filter-title-1.out      |    5 --
 utils/data-generators/cc/nmo.py                   |    2 +-
 6 files changed, 4 insertions(+), 78 deletions(-)
---
diff --git a/data/ontologies/34-nmo.ontology b/data/ontologies/34-nmo.ontology
index 773f426..3bde7ed 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-25T13:30:00Z" .
+	nao:lastModified "2011-01-25T14:00:00Z" .
 
 # FIXME Extension requested in Nepomuk
 nmo:MimePart a rdfs:Class ;
@@ -416,26 +416,11 @@ nmo:phoneMessageId a rdf:Property ;
 	rdfs:domain nmo:PhoneMessage;
 	rdfs:range xsd:integer.
 
-nmo:smsId a rdf:Property ;
-	rdfs:label "sms Id";
-	rdfs:comment "Id assigned in the system when the message is received. Use phoneMessageId instead" ;
-	nrl:maxCardinality 1 ;
-	nao:deprecated true ;
-	rdfs:subPropertyOf nmo:phoneMessageId ;
-	rdfs:domain nmo:PhoneMessage;
-	rdfs:range xsd:integer .
-
 nmo:PhoneMessageFolder a rdfs:Class ;
 	rdfs:label "Phone message Folder";
 	rdfs:comment "Folder for phone message (SMS and MMS). Not a subclass of nfo:Folder because it would confuse filesystem folders" ;
 	rdfs:subClassOf nie:InformationElement .
 
-nmo:SMSFolder a rdfs:Class ;
-	rdfs:label "SMS Folder";
-	rdfs:comment "Folder for SMS. Not a subclass of nfo:Folder because it would confuse filesystem folders. Use the superclass PhoneMessageFolder and its predefined instances." ;
-	nao:deprecated true ;
-	rdfs:subClassOf nmo:PhoneMessageFolder .
-
 nmo:phoneMessageFolderId a rdf:Property ;
 	rdfs:label "folder id";
 	rdfs:comment "Id assigned to the folder for sync purpouses" ;
@@ -444,15 +429,6 @@ nmo:phoneMessageFolderId a rdf:Property ;
 	rdfs:range xsd:string ;
 	rdfs:subPropertyOf nie:identifier .
 
-nmo:smsFolderId a rdf:Property ;
-	rdfs:label "folder id";
-	rdfs:comment "Id assigned to the folder for sync purpouses" ;
-	nrl:maxCardinality 1 ;
-	nao:deprecated true ;
-	rdfs:domain nmo:SMSFolder ;
-	rdfs:range xsd:string ;
-	rdfs:subPropertyOf nmo:phoneMessageFolderId .
-
 nmo:validityPeriod a rdf:Property ;
 	rdfs:label "Validity period" ;
 	rdfs:comment "Validity period of an SMS in seconds. It is a value coming from the network" ;
@@ -466,28 +442,12 @@ nmo:containsPhoneMessageFolder a rdf:Property ;
 	rdfs:domain nmo:PhoneMessageFolder;
 	rdfs:range nmo:PhoneMessageFolder .
 
-nmo:containsSMSFolder a rdf:Property ;
-	rdfs:label "contains SMS Folder";
-	rdfs:comment "To link and reconstruct a hierarchy of folders. Use containsPhoneMessageFolder instead." ;
-	rdfs:subPropertyOf nmo:containsPhoneMessageFolder ;
-	nao:deprecated true ;
-	rdfs:domain nmo:SMSFolder;
-	rdfs:range nmo:SMSFolder .
-
 nmo:containsPhoneMessage a rdf:Property ;
 	rdfs:label "Contains Phone Message";
 	rdfs:comment "Link between an Phone Message and a Folder" ;
 	rdfs:domain nmo:PhoneMessageFolder;
 	rdfs:range nmo:PhoneMessage .
 
-nmo:containsSMS a rdf:Property ;
-	rdfs:label "Contains SMS";
-	rdfs:comment "Link between an Phone Message and a Folder. Use containsPhoneMessage instead" ;
-	nao:deprecated true ;
-	rdfs:subPropertyOf nmo:containsPhoneMessage ;
-	rdfs:domain nmo:SMSFolder;
-	rdfs:range nmo:PhoneMessage .
-
 
 nmo:predefined-phone-msg-folder-inbox a nmo:PhoneMessageFolder ;
 	nie:title "Inbox" ;
@@ -510,30 +470,6 @@ nmo:predefined-phone-msg-folder-myfolder a nmo:PhoneMessageFolder ;
 	nie:title "MyFolder" ;
 	nmo:phoneMessageFolderId "0x1008" .
 
-#
-# All these instances are deprecated
-#
-nmo:default-sms-folder-inbox a nmo:SMSFolder ;
-	nie:title "Inbox (deprecated)" ;
-	nmo:smsFolderId "0x1002" .
-
-nmo:default-sms-folder-outbox a nmo:SMSFolder ;
-	nie:title "Outbox (deprecated)" ;
-	nmo:smsFolderId "0x1003" .
-
-nmo:default-sms-folder-draft a nmo:SMSFolder ;
-	nie:title "Draft (deprecated)" ;
-	nmo:smsFolderId "0x1004" .
-
-nmo:default-sms-folder-sent a nmo:SMSFolder ;
-	nie:title "Sent (deprecated)" ;
-	nmo:smsFolderId "0x1005" .
-
-
-nmo:default-sms-folder-myfolder a nmo:SMSFolder ;
-	nie:title "MyFolder (deprecated)" ;
-	nmo:smsFolderId "0x1008" .
-
 nmo:DeliveryStatus a rdfs:Class ;
 	rdfs:label "Delivery statuses" ;
 	rdfs:comment "Predefined set of delivery status instances" ;
diff --git a/tests/functional-tests/performance-tc-modified.py b/tests/functional-tests/performance-tc-modified.py
index 5bb7980..9b90575 100644
--- a/tests/functional-tests/performance-tc-modified.py
+++ b/tests/functional-tests/performance-tc-modified.py
@@ -418,7 +418,7 @@ class rtcom(TestUpdate):
 			     nmo:isAnswered(?message) \
 			     nmo:isDeleted(?message) \
 			     nmo:messageId(?message) \
-			     nmo:smsId(?message) \
+			     nmo:phoneMessageId(?message) \
 			     nmo:sentDate(?message) \
 			     nmo:receivedDate(?message) \
 			     nie:contentLastModified(?message) \
diff --git a/tests/functional-tests/performance-tc.py b/tests/functional-tests/performance-tc.py
index 460e226..85cfa5d 100644
--- a/tests/functional-tests/performance-tc.py
+++ b/tests/functional-tests/performance-tc.py
@@ -345,7 +345,7 @@ SELECT ?message ?date ?from ?to \
      nmo:isAnswered(?message) \
      nmo:isDeleted(?message) \
      nmo:messageId(?message) \
-     nmo:smsId(?message) \
+     nmo:phoneMessageId(?message) \
      nmo:sentDate(?message) \
      nmo:receivedDate(?message) \
      nie:contentLastModified(?message) \
diff --git a/tests/libtracker-data/nie/filter-identifier-1.out b/tests/libtracker-data/nie/filter-identifier-1.out
index 8bf260d..593fe1e 100644
--- a/tests/libtracker-data/nie/filter-identifier-1.out
+++ b/tests/libtracker-data/nie/filter-identifier-1.out
@@ -1,12 +1,7 @@
 "0x1002"
-"0x1002"
-"0x1003"
 "0x1003"
 "0x1004"
-"0x1004"
 "0x1005"
-"0x1005"
-"0x1008"
 "0x1008"
 "12000"
 "15000"
diff --git a/tests/libtracker-data/nie/filter-title-1.out b/tests/libtracker-data/nie/filter-title-1.out
index 4743e7d..a03602a 100644
--- a/tests/libtracker-data/nie/filter-title-1.out
+++ b/tests/libtracker-data/nie/filter-title-1.out
@@ -5,7 +5,6 @@
 "Communication"
 "Communication"
 "Draft"
-"Draft (deprecated)"
 "Educational institute"
 "Educational institute"
 "Entertainment"
@@ -15,11 +14,8 @@
 "Geographical area"
 "Geographical area"
 "Inbox"
-"Inbox (deprecated)"
 "MyFolder"
-"MyFolder (deprecated)"
 "Outbox"
-"Outbox (deprecated)"
 "Outdoor activities"
 "Outdoor activities"
 "People"
@@ -29,7 +25,6 @@
 "Religious places"
 "Religious places"
 "Sent"
-"Sent (deprecated)"
 "Shopping"
 "Shopping"
 "Sightseeing"
diff --git a/utils/data-generators/cc/nmo.py b/utils/data-generators/cc/nmo.py
index ffc9509..838c2ca 100644
--- a/utils/data-generators/cc/nmo.py
+++ b/utils/data-generators/cc/nmo.py
@@ -137,7 +137,7 @@ def generateIMMessage(index):
 ####################################################################################
 nmo_SMSMessage = '''
 <%(smsmessage_uri)s> a nmo:SMSMessage;
-  nmo:smsId                  "%(smsmessage_id)s" ;
+  nmo:phoneMessageId         "%(smsmessage_id)s" ;
   nie:plainTextContent       "%(smsmessage_content)s";
   nie:informationElementDate "%(smsmessage_date)s";
   nie:contentLastModified    "%(smsmessage_modified)s";