Merge branch 'nao/agent'

Conflicts:
	CMakeLists.txt

5 files changed, 83 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index fbe488b..401a383 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,29 @@
+0.7
+    02/22/2011 - trueg
+	Added new class nao:Agent and new property nao:maintainedBy
+
 0.6
+    12/13/2010 - trueg
+        Added new property nie:htmlContent as a super property of nmo:htmlMessageContent
+
+    12/08/2010 - trueg
+        Fixed cardinalities on:
+          nco:streetAddress
+          nco:pobox
+          nco:phoneNumber
+          nco:nameGiven
+          nco:nameFamily
+          nco:extendedAddress
+          nco:hasLocation
+          nco:addressLocation
+          nco:org
+          nco:title
+          nco:voiceMail
+          nco:imAccountType
+          nco:imStatusMessage
+          nco:isBlocked
+        Deprecated nco:contactMediumComment in favor of nie:comment or nao:description - based on the context
+
 	12/07/2010 - trueg (from a patch by George Goldberg)
 		Added new properties:
 			nco:isAccessedBy
diff --git a/nao/nao.trig.in b/nao/nao.trig.in
index a3a3ed0..9107b0f 100644
--- a/nao/nao.trig.in
+++ b/nao/nao.trig.in
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2007 NEPOMUK Consortium
+# Copyright (c) 2011 Sebastian Trueg <trueg@kde.org>
 # All rights reserved, licensed under either CC-BY or BSD.
 #
 # You are free:
@@ -353,6 +354,20 @@
           rdfs:comment "Mark a property, class, or even resource as user visible or not. Non-user-visible entities should never be presented to the user. By default everything is user-visible." ;
           nao:userVisible false ;
           nrl:maxCardinality 1 .
+
+    nao:Agent
+          a rdfs:Class ;
+          rdfs:label "agent" ;
+          rdfs:comment "An agent is the artificial counterpart to nao:Party. It can be a software component or some service." ;
+          rdfs:subClassOf rdfs:Resource .
+
+    nao:maintainedBy
+          a rdf:Property ;
+          rdfs:label "maintained by" ;
+          rdfs:comment "The agent that maintains this resource, ie. created it and knows what to do with it." ;
+          rdfs:domain rdfs:Resources ;
+          rdfs:range nao:Agent ;
+          rdfs:subPropertyOf nao:annotation .
 }
 
 <http://www.semanticdesktop.org/ontologies/2007/08/15/nao/metadata> {
@@ -365,7 +380,7 @@
           a       nrl:Ontology , nrl:DocumentGraph ;
           nao:hasDefaultNamespace "http://www.semanticdesktop.org/ontologies/2007/08/15/nao#" ;
           nao:hasDefaultNamespaceAbbreviation "nao" ;
-          nao:lastModified "2010-03-19T12:31:43Z" ;
+          nao:lastModified "2011-01-24T12:31:43Z" ;
           nao:serializationLanguage "TriG" ;
           nao:status "Unstable" ;
           nrl:updatable "0" ;
diff --git a/nco/nco.trig.in b/nco/nco.trig.in
index e0ab192..360272b 100644
--- a/nco/nco.trig.in
+++ b/nco/nco.trig.in
@@ -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:
@@ -95,7 +95,8 @@ nco: {nco:region
           rdfs:comment "The family name of an Object represented by this Contact. These applies to people that have more than one given name. The 'first' one is considered 'the' given name (see nameGiven) property. All additional ones are considered 'additional' names. The name inherited from parents is the 'family name'. e.g. For Dr. John Phil Paul Stevenson Jr. M.D. A.C.P. we have contact with: honorificPrefix: 'Dr.', nameGiven: 'John', nameAdditional: 'Phil', nameAdditional: 'Paul', nameFamily: 'Stevenson', honorificSuffix: 'Jr.', honorificSuffix: 'M.D.', honorificSuffix: 'A.C.P.'. These properties form an equivalent of the compound 'N' property as defined in RFC 2426 Sec. 3.1.2" ;
           rdfs:domain nco:PersonContact ;
           rdfs:label "nameFamily" ;
-          rdfs:range xsd:string .
+          rdfs:range xsd:string ;
+          nrl:maxCardinality "1" .
 
     nco:VideoTelephoneNumber
           a       rdfs:Class ;
@@ -139,7 +140,8 @@ nco: {nco:region
           rdfs:comment "An extended part of an address. This field might be used to express parts of an address that aren't include in the name of the Contact but also aren't part of the actual location. Usually the streed address and following fields are enough for a postal letter to arrive. Examples may include ('University of California Campus building 45', 'Sears Tower 34th floor' etc.) Inspired by the second part of the value of the 'ADR' property as defined in RFC 2426, sec. 3.2.1" ;
           rdfs:domain nco:PostalAddress ;
           rdfs:label "extendedAddress" ;
-          rdfs:range xsd:string .
+          rdfs:range xsd:string ;
+          nrl:maxCardinality "1" .
 
     nco:IMAccount
           a       rdfs:Class ;
@@ -174,13 +176,15 @@ nco: {nco:region
           rdfs:comment "Geographical location of the contact. Inspired by the 'GEO' property specified in RFC 2426 Sec. 3.4.2" ;
           rdfs:domain nco:Contact ;
           rdfs:label "hasLocation" ;
-          rdfs:range geo:Point .
+          rdfs:range geo:Point ;
+          nrl:maxCardinality "1" .
 
     nco:phoneNumber
           a       rdf:Property ;
           rdfs:domain nco:PhoneNumber ;
           rdfs:label "phoneNumber" ;
-          rdfs:range xsd:string .
+          rdfs:range xsd:string ;
+          nrl:maxCardinality "1" .
 
     nco:nickname
           a       rdf:Property ;
@@ -227,7 +231,8 @@ nco: {nco:region
           rdfs:comment "The geographical location of a postal address." ;
           rdfs:domain nco:PostalAddress ;
           rdfs:label "addressLocation" ;
-          rdfs:range geo:Point .
+          rdfs:range geo:Point ;
+          nrl:maxCardinality "1" .
 
     nco:note
           a       rdf:Property ;
@@ -256,7 +261,8 @@ nco: {nco:region
           rdfs:comment "The given name for the object represented by this Contact. See documentation for 'nameFamily' property for details." ;
           rdfs:domain nco:PersonContact ;
           rdfs:label "nameGiven" ;
-          rdfs:range xsd:string .
+          rdfs:range xsd:string ;
+          nrl:maxCardinality "1" .
 
     nco:PcsNumber
           a       rdfs:Class ;
@@ -302,7 +308,8 @@ nco: {nco:region
           rdfs:comment "The streed address. Inspired by the third part of the value of the 'ADR' property as defined in RFC 2426, sec. 3.2.1" ;
           rdfs:domain nco:PostalAddress ;
           rdfs:label "streetAddress" ;
-          rdfs:range xsd:string .
+          rdfs:range xsd:string ;
+          nrl:maxCardinality "1" .
 
     nco:OrganizationContact
           a       rdfs:Class ;
@@ -433,7 +440,8 @@ nco: {nco:region
           rdfs:comment "Name of an organization or a unit within an organization the object represented by a Contact is associated with. An equivalent of the 'ORG' property defined in RFC 2426 Sec. 3.5.5" ;
           rdfs:domain nco:Affiliation ;
           rdfs:label "org" ;
-          rdfs:range nco:OrganizationContact .
+          rdfs:range nco:OrganizationContact ;
+          nrl:maxCardinality "1" .
 
     nco:PersonContact
           a       rdfs:Class ;
@@ -452,7 +460,8 @@ nco: {nco:region
           rdfs:comment "The official title  the object represented by this contact in an organization. E.g. 'CEO', 'Director, Research and Development', 'Junior Software Developer/Analyst' etc. An equivalent of the 'TITLE' property defined in RFC 2426 Sec. 3.5.1" ;
           rdfs:domain nco:Affiliation ;
           rdfs:label "title" ;
-          rdfs:range xsd:string .
+          rdfs:range xsd:string ;
+          nrl:maxCardinality "1" .
 
     nco:AudioIMAccount
           a       rdfs:Class ;
@@ -466,7 +475,8 @@ nco: {nco:region
           rdfs:comment "Indicates if the given number accepts voice mail. (e.g. there is an answering machine). Inspired by TYPE=msg parameter of the TEL property defined in RFC 2426 sec. 3.3.1" ;
           rdfs:domain nco:VoicePhoneNumber ;
           rdfs:label "voiceMail" ;
-          rdfs:range xsd:boolean .
+          rdfs:range xsd:boolean ;
+          nrl:maxCardinality "1" .
 
     nco:PostalAddress
           a       rdfs:Class ;
@@ -634,14 +644,16 @@ nco: {nco:region
           rdfs:comment "Type of the IM account. This may be the name of the service that provides the IM functionality. Examples might include Jabber, ICQ, MSN etc" ;
           rdfs:domain nco:IMAccount ;
           rdfs:label "imAccountType" ;
-          rdfs:range xsd:string .
+          rdfs:range xsd:string ;
+          nrl:maxCardinality "1" .
 
     nco:pobox
           a       rdf:Property ;
           rdfs:comment "Post office box. This is the first part of the value of the 'ADR' property as defined in RFC 2426, sec. 3.2.1" ;
           rdfs:domain nco:PostalAddress ;
           rdfs:label "pobox" ;
-          rdfs:range xsd:string .
+          rdfs:range xsd:string  ;
+          nrl:maxCardinality "1".
 
     nco:hasAffiliation
           a       rdf:Property ;
@@ -663,7 +675,8 @@ nco: {nco:region
           rdfs:comment "A feature common in most IM systems. A message left by the user for all his/her contacts to see." ;
           rdfs:domain nco:IMAccount ;
           rdfs:label "imStatusMessage" ;
-          rdfs:range xsd:string .
+          rdfs:range xsd:string ;
+          nrl:maxCardinality "1" .
  
     nco:start
           a rdf:Property ;
@@ -723,7 +736,8 @@ nco: {nco:region
           rdfs:comment "Indicates that this IMAccount has been blocked." ;
           rdfs:domain nco:IMAccount ;
           rdfs:label "isBlocked" ;
-          rdfs:range xsd:boolean .
+          rdfs:range xsd:boolean ;
+          nrl:maxCardinality "1" .
 }
 
 <http://www.semanticdesktop.org/ontologies/2007/03/22/nco_metadata#> {nco:  a       nrl:Ontology ;
@@ -732,7 +746,7 @@ nco: {nco:region
                   "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#" ;
           nao:hasDefaultNamespaceAbbreviation
                   "nco" ;
-          nao:lastModified "2009-11-27T11:45:58Z" ;
+          nao:lastModified "2010-12-08T13:35:58Z" ;
           nao:status "Unstable" ;
           nao:updatable "0 " ;
           nao:version "${SHAREDDESKTOPONTOLOGIES_VERSION}" .
diff --git a/nie/nie.trig.in b/nie/nie.trig.in
index 62a9f18..8735b39 100644
--- a/nie/nie.trig.in
+++ b/nie/nie.trig.in
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2007 NEPOMUK Consortium
+# Copyright (c) 2010 Sebastian Trueg <trueg@kde.org>
 # All rights reserved, licensed under either CC-BY or BSD.
 #
 # You are free:
@@ -290,6 +291,13 @@ nie: {nie:characterSet
           rdfs:label "plainTextContent" ;
           rdfs:range xsd:string .
 
+    nie:htmlContent
+          a       rdf:Property ;
+          rdfs:comment "The HTML content of an information element. This property can be used to store text including formatting in a generic fashion." ;
+          rdfs:domain nie:InformationElement ;
+          rdfs:label "html content" ;
+          rdfs:range xsd:string .
+
     nie:comment
           a       rdf:Property ;
           rdfs:comment "A user comment about an InformationElement." ;
@@ -382,7 +390,7 @@ nie: {nie:characterSet
                   "http://www.semanticdesktop.org/ontologies/2007/01/19/nie#" ;
           nao:hasDefaultNamespaceAbbreviation
                   "nie" ;
-          nao:lastModified "2009-11-12T07:45:58Z" ;
+          nao:lastModified "2010-12-13T18:45:58Z" ;
           nao:status "Unstable" ;
           nao:updatable "0 " ;
           nao:version "${SHAREDDESKTOPONTOLOGIES_VERSION}" .
diff --git a/nmo/nmo.trig.in b/nmo/nmo.trig.in
index 624ddf4..120e709 100644
--- a/nmo/nmo.trig.in
+++ b/nmo/nmo.trig.in
@@ -304,7 +304,8 @@ content defaults to the value specified by the 'mimeType' property.""" ;
           rdfs:comment "HTML representation of the body of the message. For multipart messages, all parts are concatenated into the value of this property. Attachments, whose mimeTypes are different from text/plain or message/rfc822 are considered separate DataObjects and are therefore not included in the value of this property." ;
           rdfs:domain nmo:Message ;
           rdfs:label "htmlMessageContent" ;
-          rdfs:range xsd:string .
+          rdfs:range xsd:string ;
+          rdfs:subPropertyOf nie:htmlContent .
 
     nmo:sentDate
           a       rdf:Property ;
@@ -368,7 +369,7 @@ 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-12T10:51:45.656Z" ;
+          nao:lastModified "2010-12-13T18:51:45.656Z" ;
           nao:status "Unstable" ;
           nao:updatable "0 " ;
           nao:version "${SHAREDDESKTOPONTOLOGIES_VERSION}" .