Merge
authorGraham Klyne
Thu, 26 Apr 2012 14:55:35 +0100
changeset 2564 9e3f2a1a8574
parent 2563 ba89f8345d59 (current diff)
parent 2558 e2a8b91db31f (diff)
child 2566 c44550dc0504
Merge
--- a/examples/eg-24-prov-o-html-examples/rdf/create/rdf/class_AgentInvolvement.ttl	Thu Apr 26 14:53:22 2012 +0100
+++ b/examples/eg-24-prov-o-html-examples/rdf/create/rdf/class_AgentInvolvement.ttl	Thu Apr 26 14:55:35 2012 +0100
@@ -4,4 +4,16 @@
 @prefix prov: <http://www.w3.org/ns/prov#> .
 @prefix :     <http://example.com/> .
 
-# TODO
+:illustrating
+    a prov:Activity; 
+    prov:wasAssociatedWith :derek ;
+    prov:qualifiedAssociation [
+		a prov:AgentInvolvement ;        
+        a prov:Association ;
+        prov:agent :derek ;
+        prov:role :illustrationist
+    ] .
+
+:derek a prov:Person, prov:Agent, prov:Entity .
+
+:illustratonist a prov:Role .
\ No newline at end of file
--- a/examples/eg-24-prov-o-html-examples/rdf/create/rdf/class_DictionaryInvolvement.ttl	Thu Apr 26 14:53:22 2012 +0100
+++ b/examples/eg-24-prov-o-html-examples/rdf/create/rdf/class_DictionaryInvolvement.ttl	Thu Apr 26 14:55:35 2012 +0100
@@ -4,5 +4,15 @@
 @prefix prov: <http://www.w3.org/ns/prov#> .
 @prefix :     <http://example.com/> .
 
+:c1 a prov:Dictionary .
 
-#TO DO
\ No newline at end of file
+:c2 a prov:Dictionary, prov:Entity .
+    prov:derivedByRemovalFrom :c1 ;
+    prov:qualifiedRemoval [
+        a prov:DictionaryInvolvement ;
+        a prov:Removal, prov:DictionaryInvolvement ;
+        prov:dictionary :c1 ;
+        prov:removedKey "k1"^^xsd:string  
+    ] .
+
+
--- a/examples/eg-24-prov-o-html-examples/rdf/create/rdf/class_Responsibility.ttl	Thu Apr 26 14:53:22 2012 +0100
+++ b/examples/eg-24-prov-o-html-examples/rdf/create/rdf/class_Responsibility.ttl	Thu Apr 26 14:55:35 2012 +0100
@@ -1,19 +1,20 @@
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
-@prefix owl:  <http://www.w3.org/2002/07/owl#> .
-@prefix prov: <http://www.w3.org/ns/prov#> .
-@prefix :     <http://example.com/> .
 
-:policySale
-  a prov:Actvity;
-  prov:wasAssociatedWith :InsuranceAgent_Frank.
-
-:InsuranceAgent_Frank
-  a prov:Person,
-  prov:actedOnBehalfOf :InsuranceCompany_A;
-  prov:qualifiedResponsibility [
-     a prov:Responsibility;
-     prov:agent :InsuranceCompany_A;
-     prov:hadRole :guarantor; #The company is the guarantor of the policy
-  ];
-.
\ No newline at end of file
+  @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+  @prefix xsd:  <http://www.w3.org/2001/XMLSchema#> .
+  @prefix owl:  <http://www.w3.org/2002/07/owl#> .
+  @prefix prov: <http://www.w3.org/ns/prov#> .
+  @prefix :     <http://example.com/> .
+  
+  :policySale
+    a prov:Actvity;
+    prov:wasAssociatedWith :InsuranceAgent_Frank.
+ 
+ :InsuranceAgent_Frank
+   a prov:Person,
+   prov:actedOnBehalfOf :InsuranceCompany_A;
+   prov:qualifiedResponsibility [
+      a prov:Responsibility;
+      prov:agent :InsuranceCompany_A;
+      prov:hadRole :guarantor; #The company is the guarantor of the policy
+   ];
+ .
\ No newline at end of file
--- a/examples/eg-24-prov-o-html-examples/rdf/create/rdf/property_entity.ttl	Thu Apr 26 14:53:22 2012 +0100
+++ b/examples/eg-24-prov-o-html-examples/rdf/create/rdf/property_entity.ttl	Thu Apr 26 14:55:35 2012 +0100
@@ -4,4 +4,13 @@
 @prefix prov: <http://www.w3.org/ns/prov#> .
 @prefix :     <http://example.com/> .
 
-# TODO
+:myPost 
+	a prov:Entity;
+	prov:hadOriginalSource :donQuixote;
+	prov:qualifiedSource [
+		a prov:Source;
+		prov:entity :donQuixote;
+		#other attributes of the relationship
+	].
+	
+:donQuixote a prov:Entity.
--- a/examples/eg-24-prov-o-html-examples/rdf/create/rdf/property_hadUsage.ttl	Thu Apr 26 14:53:22 2012 +0100
+++ b/examples/eg-24-prov-o-html-examples/rdf/create/rdf/property_hadUsage.ttl	Thu Apr 26 14:55:35 2012 +0100
@@ -4,4 +4,14 @@
 @prefix prov: <http://www.w3.org/ns/prov#> .
 @prefix :     <http://example.com/> .
 
-# TODO
+:digestedProteinSample1
+  a prov:Entity;
+  prov:wasDerivedFrom :proteinSample;
+  prov:qualifiedDerivation [
+     a prov:Derivation;
+     prov:hadUsage [
+     :treatmentEnzyme :Trypsin;
+     ]
+.
+  ]
+.
\ No newline at end of file
--- a/examples/eg-24-prov-o-html-examples/rdf/create/rdf/property_hasAnnotation.ttl	Thu Apr 26 14:53:22 2012 +0100
+++ b/examples/eg-24-prov-o-html-examples/rdf/create/rdf/property_hasAnnotation.ttl	Thu Apr 26 14:55:35 2012 +0100
@@ -5,12 +5,11 @@
 @prefix :     <http://example.com/> .
 
 :post112 
-	a prov:Entity;
-	prov:hasAnnotation :parserNote.
-	
-:parserNote{
-	:parserNote a prov:Note.
-	:post112 :parsedAt 2012-04-15T13:00:00-04:00"^^xsd:dateTime.
-	
-	#Other statements annotating the resource could be added here
-}
+   a prov:Entity;
+   prov:hasAnnotation :myNote;
+.
+   
+:myNote 
+   a prov:Note;
+   :reputation "excellent";
+.
--- a/examples/eg-24-prov-o-html-examples/rdf/create/rdf/property_key.ttl	Thu Apr 26 14:53:22 2012 +0100
+++ b/examples/eg-24-prov-o-html-examples/rdf/create/rdf/property_key.ttl	Thu Apr 26 14:55:35 2012 +0100
@@ -4,4 +4,11 @@
 @prefix prov: <http://www.w3.org/ns/prov#> .
 @prefix :     <http://example.com/> .
 
-# TODO
+# prov:key is used to reference the key in a prov:KeyValuePair.
+
+[]
+	a prov:KeyValuePair;
+	prov:key   "first-baseman"^^xsd:string ;
+	prov:value <http://dbpedia.org/resource/Jim_Thorpe> .
+
+<http://dbpedia.org/resource/Jim_Thorpe> a prov:Entity .
\ No newline at end of file
--- a/examples/eg-24-prov-o-html-examples/rdf/create/rdf/property_qualifiedStart.ttl	Thu Apr 26 14:53:22 2012 +0100
+++ b/examples/eg-24-prov-o-html-examples/rdf/create/rdf/property_qualifiedStart.ttl	Thu Apr 26 14:55:35 2012 +0100
@@ -4,4 +4,15 @@
 @prefix prov: <http://www.w3.org/ns/prov#> .
 @prefix :     <http://example.com/> .
 
-# TODO
+# Start can be used to qualify wasStartedBy with time and location information
+:experiment
+	a prov:Activity ;
+	prov:wasStartedBy :researcher ;
+	prov:qualifiedStart [
+		a prov:Start;
+		prov:entity :researcher;
+		prov:atTime "2011-07-06T01:48:36Z"^^xsd:dateTime;
+		prov:atLocation :scienceLab003
+	].
+
+:researcher a prov:Agent.
\ No newline at end of file
--- a/ontology/ProvenanceOntology.owl	Thu Apr 26 14:53:22 2012 +0100
+++ b/ontology/ProvenanceOntology.owl	Thu Apr 26 14:55:35 2012 +0100
@@ -42,26 +42,26 @@
      -->
 
     <owl:AnnotationProperty rdf:about="&prov;unqualifiedForm">
+        <rdfs:comment xml:lang="en">Classes and properties used to qualify relationships are annotated with prov:unqualifiedForm to indicate the property used to assert an unqualified provenance relation.</rdfs:comment>
         <rdfs:subPropertyOf rdf:resource="&rdfs;seeAlso"/>
-        <rdfs:comment xml:lang="en">Classes and properties used to qualify relationships are annotated with prov:unqualifiedForm to indicate the property used to assert an unqualified provenance relation.</rdfs:comment>
     </owl:AnnotationProperty>
     <owl:AnnotationProperty rdf:about="&prov;prov-n">
+        <rdfs:comment xml:lang="en">A reference to the principal section of the PROV-M document that describes this concept.</rdfs:comment>
         <rdfs:subPropertyOf rdf:resource="&rdfs;seeAlso"/>
-        <rdfs:comment xml:lang="en">A reference to the principal section of the PROV-M document that describes this concept.</rdfs:comment>
     </owl:AnnotationProperty>
     <owl:AnnotationProperty rdf:about="&prov;prov-dm">
+        <rdfs:comment xml:lang="en">A reference to the principal section of the PROV-DM document that describes this concept.</rdfs:comment>
         <rdfs:subPropertyOf rdf:resource="&rdfs;seeAlso"/>
-        <rdfs:comment xml:lang="en">A reference to the principal section of the PROV-DM document that describes this concept.</rdfs:comment>
     </owl:AnnotationProperty>
     <owl:AnnotationProperty rdf:about="&prov;definition">
         <rdfs:comment xml:lang="en">A definition quoted from PROV-DM or PROV-CONSTRAINTS that describes the concept expressed with this OWL term.</rdfs:comment>
     </owl:AnnotationProperty>
+    <owl:AnnotationProperty rdf:about="&rdfs;label">
+        <rdfs:comment xml:lang="en"></rdfs:comment>
+    </owl:AnnotationProperty>
     <owl:AnnotationProperty rdf:about="&prov;editorialNote">
         <rdfs:comment xml:lang="en">A note by the OWL development team about how this term expresses the PROV-DM concept, or how it should be used in context of semantic web or linked data.</rdfs:comment>
     </owl:AnnotationProperty>
-    <owl:AnnotationProperty rdf:about="&rdfs;label">
-        <rdfs:comment xml:lang="en"></rdfs:comment>
-    </owl:AnnotationProperty>
     <owl:AnnotationProperty rdf:about="&prov;inverse">
         <rdfs:comment xml:lang="en">PROV-O does not define all property inverses. The directionalities defined in PROV-O should be given preference over those not defined. However, if users wish to name the inverse of a PROV-O property, the local name given by prov:inverse should be used.</rdfs:comment>
     </owl:AnnotationProperty>
@@ -72,14 +72,14 @@
         <rdfs:comment xml:lang="en"></rdfs:comment>
     </owl:AnnotationProperty>
     <owl:AnnotationProperty rdf:about="&prov;category">
-        <rdfs:comment xml:lang="en">Classify prov-o terms into three categories, including 'starting-point', 'qualifed', and 'extended'. This classification is used by the prov-o html document to gently introduce prov-o terms to its users. </rdfs:comment>
+        <rdfs:comment xml:lang="en">Classify prov-o terms into three categories, including &#39;starting-point&#39;, &#39;qualifed&#39;, and &#39;extended&#39;. This classification is used by the prov-o html document to gently introduce prov-o terms to its users. </rdfs:comment>
     </owl:AnnotationProperty>
     <owl:AnnotationProperty rdf:about="&prov;prov-dm-constraints">
+        <rdfs:comment xml:lang="en">A reference to the principal section of the PROV-CONSTRAINTS document that describes this concept.</rdfs:comment>
         <rdfs:subPropertyOf rdf:resource="&rdfs;seeAlso"/>
-        <rdfs:comment xml:lang="en">A reference to the principal section of the PROV-CONSTRAINTS document that describes this concept.</rdfs:comment>
     </owl:AnnotationProperty>
     <owl:AnnotationProperty rdf:about="&prov;component">
-        <rdfs:comment xml:lang="en">Classify prov-o terms into six components according to prov-dm, including 'agents-responsibility', 'alternate', 'annotations', 'collections', 'derivations', and 'entities-activities'. This classification is used so that readers of prov-o specification can find its correspondence with the prov-dm specification.</rdfs:comment>
+        <rdfs:comment xml:lang="en">Classify prov-o terms into six components according to prov-dm, including &#39;agents-responsibility&#39;, &#39;alternate&#39;, &#39;annotations&#39;, &#39;collections&#39;, &#39;derivations&#39;, and &#39;entities-activities&#39;. This classification is used so that readers of prov-o specification can find its correspondence with the prov-dm specification.</rdfs:comment>
     </owl:AnnotationProperty>
     <owl:AnnotationProperty rdf:about="&prov;qualifiedForm">
         <rdfs:comment xml:lang="en">This annotation property links a prov:involved subproperty with a prov:Involved subclass. This indicates that the property can be qualified by using prov:qualified. 
@@ -282,6 +282,7 @@
             <owl:Class>
                 <owl:unionOf rdf:parseType="Collection">
                     <rdf:Description rdf:about="&prov;Derivation"/>
+                    <rdf:Description rdf:about="&prov;Invalidation"/>
                     <rdf:Description rdf:about="&prov;Responsibility"/>
                 </owl:unionOf>
             </owl:Class>
@@ -498,7 +499,7 @@
     <owl:ObjectProperty rdf:about="&prov;qualifiedCommunication">
         <rdf:type rdf:resource="&owl;InverseFunctionalProperty"/>
         <prov:component>entities-activities</prov:component>
-        <rdfs:comment xml:lang="en">If this Activity prov:wasInformedBy Activity :a, then it can qualify how it was Inform[ed] using prov:qualifiedInform [ a prov:Inform;  prov:activity :a; :foo :bar ].</rdfs:comment>
+        <rdfs:comment xml:lang="en">If this Activity prov:wasInformedBy Activity :a, then it can qualify how it was Inform[ed] using prov:qualifiedCommunication [ a prov:Communication;  prov:activity :a; :foo :bar ].</rdfs:comment>
         <prov:category>qualified</prov:category>
         <rdfs:domain rdf:resource="&prov;Activity"/>
         <rdfs:range rdf:resource="&prov;Communication"/>
@@ -1155,7 +1156,7 @@
         <prov:prov-dm>http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html#term-ActivityAssociation</prov:prov-dm>
         <prov:category>qualified</prov:category>
         <prov:definition>An activity association is an assignment of responsibility to an agent for an activity, indicating that the agent had a role in the activity. It further allows for a plan to be specified, which is the plan intended by the agent to achieve some goals in the context of this activity.</prov:definition>
-        <rdfs:comment xml:lang="en">An instance of prov:Association provides additional descriptions about the binary prov:wasAssociatedWith relation from an prov:Activity to some prov:Agent that is responsible for it. For example, :baking prov:wasAssociatedWith :baker; prov:qualified [ a prov:Association; prov:entity :baker; :foo :bar ].</rdfs:comment>
+        <rdfs:comment xml:lang="en">An instance of prov:Association provides additional descriptions about the binary prov:wasAssociatedWith relation from an prov:Activity to some prov:Agent that is responsible for it. For example, :baking prov:wasAssociatedWith :baker; prov:qualified [ a prov:Association; prov:agent :baker; :foo :bar ].</rdfs:comment>
         <prov:prov-dm-constraints>http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm-constraints.html#term-Association</prov:prov-dm-constraints>
         <prov:unqualifiedForm rdf:resource="&prov;wasAssociatedWith"/>
     </owl:Class>
--- a/primer/WD-prov-primer-20120503/Overview.html	Thu Apr 26 14:53:22 2012 +0100
+++ b/primer/WD-prov-primer-20120503/Overview.html	Thu Apr 26 14:55:35 2012 +0100
@@ -1355,6 +1355,6 @@
 <!-- OddPage -->
 <h2><span class="secno">D. </span>References</h2><div id="normative-references" class="section"><h3><span class="secno">D.1 </span>Normative references</h3><p>No normative references.</p></div><div id="informative-references" class="section"><h3><span class="secno">D.2 </span>Informative references</h3><dl class="bibliography"><dt id="bib-PROV-DM">[PROV-DM]</dt><dd>Luc Moreau, Paolo Missier<a href="http://www.w3.org/TR/prov-dm/"><cite>The PROV Data Model and Abstract Syntax Notation</cite></a>. Working DraftURL: <a href="http://www.w3.org/TR/prov-dm/">http://www.w3.org/TR/prov-dm/</a>
 </dd><dt id="bib-PROV-N">[PROV-N]</dt><dd>Luc Moreau, Paolo Missier<a href="http://www.w3.org/TR/prov-n/"><cite>PROV-N: The PROV Notation</cite></a>. Working DraftURL: <a href="http://www.w3.org/TR/prov-n/">http://www.w3.org/TR/prov-n/</a>
-</dd><dt id="bib-PROV-O">[PROV-O]</dt><dd>Satya Sahoo, Deborah McGuinness<a href="http://www.w3.org/TR/prov-o/"><cite>The PROV Ontology: Model and Formal Semantics</cite></a>. Working DraftURL: <a href="http://www.w3.org/TR/prov-o/">http://www.w3.org/TR/prov-o/</a>
+</dd><dt id="bib-PROV-O">[PROV-O]</dt><dd>Timothy Lebo, Satya Sahoo, Deborah McGuinness, Mike Lang Jr.<a href="http://www.w3.org/TR/prov-o/"><cite>The PROV Ontology: Model and Formal Semantics</cite></a>. Working DraftURL: <a href="http://www.w3.org/TR/prov-o/">http://www.w3.org/TR/prov-o/</a>
 </dd><dt id="bib-TURTLE">[TURTLE]</dt><dd>Eric Prud'hommeaux, Gavin Carothers<a href="http://www.w3.org/TR/2011/WD-turtle-20110809/"><cite>Turtle: Terse RDF Triple Language</cite></a>. 9 August 2011. W3C Working Draft. URL: <a href="http://www.w3.org/TR/2011/WD-turtle-20110809/">http://www.w3.org/TR/2011/WD-turtle-20110809/</a>
 </dd></dl></div></div></body></html>
\ No newline at end of file