Reverted changes in commit r81, applied patch in ticket #67 to deprecate

properties in range nco:Contact and add equivalent ones in range
nco:ContactMedium

1 files changed, 87 insertions, 9 deletions

diff --git a/nmo/nmo.trig b/nmo/nmo.trig
index 313e8c6..8a66179 100644
--- a/nmo/nmo.trig
+++ b/nmo/nmo.trig
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2007 NEPOMUK Consortium
-# Copyright (c) 2009 Sebastian Trueg <trueg@kde.org>
+# Copyright (c) 2009-2010 Sebastian Trueg <trueg@kde.org>
 # All rights reserved, licensed under either CC-BY or BSD.
 #
 # You are free:
@@ -90,22 +90,48 @@ nmo: {nmo:IMMessage
 
     nmo:to
           a       rdf:Property ;
+          nao:deprecated true ;
+          rdfs:comment "deprecated in favor of nmo:emailTo" ;
+          rdfs:domain nmo:Email ;
+          rdfs:label "to" ;
+          rdfs:range nco:Contact ;
+          rdfs:subPropertyOf nmo:primaryRecipient .
+
+    nmo:emailTo
+          a       rdf:Property ;
           rdfs:comment "The primary intended recipient of an email." ;
           rdfs:domain nmo:Email ;
           rdfs:label "to" ;
           rdfs:range nco:ContactMedium ;
-          rdfs:subPropertyOf nmo:primaryRecipient .
+          rdfs:subPropertyOf nmo:primaryMessageRecipient .
 
     nmo:cc
           a       rdf:Property ;
+          nao:deprecated true ;
+          rdfs:comment "deprecated in favor of nmo:emailCc" ;
+          rdfs:domain nmo:Email ;
+          rdfs:label "cc" ;
+          rdfs:range nco:Contact ;
+          rdfs:subPropertyOf nmo:secondaryRecipient .
+
+    nmo:emailCc
+          a       rdf:Property ;
           rdfs:comment "A Contact that is to receive a cc of the email. A cc (carbon copy) is a copy of an email message whose recipient appears on the recipient list, so that all other recipients are aware of it." ;
           rdfs:domain nmo:Email ;
           rdfs:label "cc" ;
           rdfs:range nco:ContactMedium ;
-          rdfs:subPropertyOf nmo:secondaryRecipient .
+          rdfs:subPropertyOf nmo:secondaryMessageRecipient .
 
     nmo:from
           a       rdf:Property ;
+          nao:deprecated true ;
+          rdfs:comment "deprecated in favor of nmo:messageFrom" ;
+          rdfs:domain nmo:Message ;
+          rdfs:label "from" ;
+          rdfs:range nco:Contact .
+
+    nmo:messageFrom
+          a       rdf:Property ;
           rdfs:comment "The sender of the message" ;
           rdfs:domain nmo:Message ;
           rdfs:label "from" ;
@@ -140,11 +166,20 @@ nmo: {nmo:IMMessage
 
     nmo:primaryRecipient
           a       rdf:Property ;
+          nao:deprecated true ;
+          rdfs:comment "deprecated in favor of primaryMessageRecipient" ;
+          rdfs:domain nmo:Message ;
+          rdfs:label "primaryRecipient" ;
+          rdfs:range nco:Contact ;
+          rdfs:subPropertyOf nmo:recipient .
+
+    nmo:primaryMessageRecipient
+          a       rdf:Property ;
           rdfs:comment "The primary intended recipient of a message." ;
           rdfs:domain nmo:Message ;
           rdfs:label "primaryRecipient" ;
           rdfs:range nco:ContactMedium ;
-          rdfs:subPropertyOf nmo:recipient .
+          rdfs:subPropertyOf nmo:messageRecipient .
 
     nmo:inReplyTo
           a       rdf:Property ;
@@ -179,6 +214,14 @@ nmo: {nmo:IMMessage
 
     nmo:replyTo
           a       rdf:Property ;
+          nao:deprecated true ;
+          rdfs:comment "deprecated in favor of nmo:messageReplyTo" ;
+          rdfs:domain nmo:Message ;
+          rdfs:label "replyTo" ;
+          rdfs:range nco:Contact .
+
+    nmo:messageReplyTo
+          a       rdf:Property ;
           rdfs:comment "An address where the reply should be sent." ;
           rdfs:domain nmo:Message ;
           rdfs:label "replyTo" ;
@@ -186,6 +229,14 @@ nmo: {nmo:IMMessage
 
     nmo:recipient
           a       rdf:Property ;
+          nao:deprecated true ;
+          rdfs:comment "deprecated in favor of nmo:messageRecipient" ;
+          rdfs:domain nmo:Message ;
+          rdfs:label "recipient" ;
+          rdfs:range nco:Contact .
+
+    nmo:messageRecipient
+          a       rdf:Property ;
           rdfs:comment "A common superproperty for all properties that link a message with its recipients. Please don't use this property directly." ;
           rdfs:domain nmo:Message ;
           rdfs:label "recipient" ;
@@ -193,19 +244,37 @@ nmo: {nmo:IMMessage
 
     nmo:bcc
           a       rdf:Property ;
+          nao:deprecated true ;
+          rdfs:comment "deprecated in favor of nmo:emailBcc" ;
+          rdfs:domain nmo:Email ;
+          rdfs:label "bcc" ;
+          rdfs:range nco:Contact ;
+          rdfs:subPropertyOf nmo:secondaryRecipient .
+
+    nmo:emailBcc
+          a       rdf:Property ;
           rdfs:comment "A Contact that is to receive a bcc of the email. A Bcc (blind carbon copy) is a copy of an email message sent to a recipient whose email address does not appear in the message." ;
           rdfs:domain nmo:Email ;
           rdfs:label "bcc" ;
           rdfs:range nco:ContactMedium ;
-          rdfs:subPropertyOf nmo:secondaryRecipient .
+          rdfs:subPropertyOf nmo:secondaryMessageRecipient .
 
     nmo:secondaryRecipient
           a       rdf:Property ;
+          nao:deprecated true ;
+          rdfs:comment "deprecated in favor of nmo:secondaryMessageRecipient" ;
+          rdfs:domain nmo:Message ;
+          rdfs:label "secondaryRecipient" ;
+          rdfs:range nco:Contact ;
+          rdfs:subPropertyOf nmo:recipient .
+
+    nmo:secondaryMessageRecipient
+          a       rdf:Property ;
           rdfs:comment "A superproperty for all \"additional\" recipients of a message." ;
           rdfs:domain nmo:Message ;
           rdfs:label "secondaryRecipient" ;
           rdfs:range nco:ContactMedium ;
-          rdfs:subPropertyOf nmo:recipient .
+          rdfs:subPropertyOf nmo:messageRecipient .
 
     nmo:contentMimeType
           a       rdf:Property ;
@@ -248,11 +317,20 @@ content defaults to the value specified by the 'mimeType' property.""" ;
 
     nmo:sender
           a       rdf:Property ;
+          nao:deprecated true ;
+          rdfs:comment "deprecated in favor of nmo:messageSender" ;
+          rdfs:domain nmo:Message ;
+          rdfs:label "sender" ;
+          rdfs:range nco:Contact ;
+          rdfs:subPropertyOf nmo:recipient .
+
+    nmo:messageSender
+          a       rdf:Property ;
           rdfs:comment "The person or agent submitting the message to the network, if other from the one given with the nmo:from property. Defined in RFC 822 sec. 4.4.2" ;
           rdfs:domain nmo:Message ;
           rdfs:label "sender" ;
           rdfs:range nco:ContactMedium ;
-          rdfs:subPropertyOf nmo:recipient .
+          rdfs:subPropertyOf nmo:messageRecipient .
 
     nmo:headerName
           a       rdf:Property ;
@@ -290,9 +368,9 @@ content defaults to the value specified by the 'mimeType' property.""" ;
                   "http://www.semanticdesktop.org/ontologies/2007/03/22/nmo#" ;
           nao:hasDefaultNamespaceAbbreviation
                   "nmo" ;
-          nao:lastModified "2010-03-09T17:43:10.656Z" ;
+          nao:lastModified "2010-03-12T10:51:45.656Z" ;
           nao:status "Unstable" ;
           nao:updatable "0 " ;
-          nao:version "Revision-11" .
+          nao:version "12" .
 }