merge
authorJim McCusker <mccusj@rpi.edu>
Wed, 06 Jun 2012 13:49:19 -0400
changeset 3204 b1a6e029a53c
parent 3203 2f792ee1d903 (current diff)
parent 3202 e56bafde128b (diff)
child 3205 0e08b78ec01a
merge
--- a/ontology/ProvenanceOntology.owl	Wed Jun 06 13:47:33 2012 -0400
+++ b/ontology/ProvenanceOntology.owl	Wed Jun 06 13:49:19 2012 -0400
@@ -54,12 +54,12 @@
     <owl:AnnotationProperty rdf:about="http://www.w3.org/ns/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="http://www.w3.org/ns/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="http://www.w3.org/ns/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>
         <rdfs:seeAlso rdf:resource="http://www.w3.org/TR/prov-o/#names-of-inverse-properties"/>
@@ -67,10 +67,10 @@
     <owl:AnnotationProperty rdf:about="&rdfs;comment">
         <rdfs:comment xml:lang="en"></rdfs:comment>
     </owl:AnnotationProperty>
+    <owl:AnnotationProperty rdf:about="&owl;versionInfo"/>
     <owl:AnnotationProperty rdf:about="&rdfs;seeAlso">
         <rdfs:comment xml:lang="en"></rdfs:comment>
     </owl:AnnotationProperty>
-    <owl:AnnotationProperty rdf:about="&owl;versionInfo"/>
     <owl:AnnotationProperty rdf:about="http://www.w3.org/ns/prov#category">
         <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>
@@ -684,9 +684,9 @@
 
     <owl:ObjectProperty rdf:about="http://www.w3.org/ns/prov#qualifiedInsertion">
         <component>collections</component>
+        <rdfs:comment xml:lang="en">If this Dictionary prov:derivedByInsertionFrom another Dictionary :e, then it can qualify how it did perform the Insertion using prov:qualifiedInsertion [ a prov:Insertion;  prov:dictionary :e; prov:inserted [a prov:KeyValuePair; prov:pairKey &quot;k1&quot;^^xsd:string; prov:pairValue :foo] ].</rdfs:comment>
         <inverse>qualifiedInsertionOf</inverse>
         <category>collections</category>
-        <rdfs:comment xml:lang="en">If this Dictionary prov:derivedByInsertionFrom another Dictionary :e, then it can qualify how it did perform the Insertion using prov:qualifiedInsertion [ a prov:Insertion;  prov:dictionary :e; prov:inserted [a prov:KeyValuePair; prov:key &quot;k1&quot;^^xsd:string; prov:value :foo] ].</rdfs:comment>
         <rdfs:domain rdf:resource="http://www.w3.org/ns/prov#Dictionary"/>
         <sharesDefinitionWith rdf:resource="http://www.w3.org/ns/prov#Insertion"/>
         <rdfs:range rdf:resource="http://www.w3.org/ns/prov#Insertion"/>
@@ -844,6 +844,7 @@
         <component>collections</component>
         <prov-dm>http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html#term-dictionary-removal</prov-dm>
         <category>collections</category>
+        <rdfs:comment xml:lang="en">The key removed from a prov:Dictionary in a Removal, resulting in a new prov:Dictionary.</rdfs:comment>
         <rdfs:range rdf:resource="http://www.w3.org/ns/prov#KeyValuePair"/>
         <rdfs:domain rdf:resource="http://www.w3.org/ns/prov#Removal"/>
     </owl:ObjectProperty>
@@ -954,9 +955,9 @@
         </owl:propertyChainAxiom>
     </owl:ObjectProperty>
     <owl:Axiom>
-        <prov-dm-constraints>http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-constraints.html#traceability-inference</prov-dm-constraints>
         <definition>IF wasAttributedTo(e2,ag1,aAttr) holds, THEN tracedTo(e2,ag1) also holds. </definition>
         <rdfs:comment>Attribution is a particular case of trace (see http://www.w3.org/TR/prov-dm/#concept-trace), in the sense that it links an entity to the agent that ascribed it.</rdfs:comment>
+        <prov-dm-constraints>http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-constraints.html#traceability-inference</prov-dm-constraints>
         <owl:annotatedProperty rdf:resource="&rdfs;subPropertyOf"/>
         <owl:annotatedTarget rdf:resource="http://www.w3.org/ns/prov#tracedTo"/>
         <owl:annotatedSource rdf:resource="http://www.w3.org/ns/prov#wasAttributedTo"/>
@@ -1248,12 +1249,14 @@
     
 
 
-    <!-- http://www.w3.org/ns/prov#removedKey -->
+    <!-- http://www.w3.org/ns/prov#removed -->
 
-    <owl:DatatypeProperty rdf:about="http://www.w3.org/ns/prov#removedKey">
+    <owl:DatatypeProperty rdf:about="http://www.w3.org/ns/prov#removed">
+        <rdfs:label xml:lang="en">removed</rdfs:label>
+        <component>collections</component>
+        <prov-dm>http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html#term-dictionary-removal</prov-dm>
         <category>collections</category>
-        <rdfs:comment xml:lang="en">The key removed in a Removal.</rdfs:comment>
-        <component>collections</component>
+        <rdfs:comment xml:lang="en">The key removed from a prov:Dictionary in a Removal, resulting in a new prov:Dictionary.</rdfs:comment>
         <rdfs:range rdf:resource="&rdfs;Literal"/>
         <rdfs:domain rdf:resource="http://www.w3.org/ns/prov#Removal"/>
     </owl:DatatypeProperty>
--- a/ontology/prov.ttl	Wed Jun 06 13:47:33 2012 -0400
+++ b/ontology/prov.ttl	Wed Jun 06 13:49:19 2012 -0400
@@ -966,7 +966,7 @@
 
 :qualifiedInsertion
     a owl:ObjectProperty ;
-    rdfs:comment "If this Dictionary prov:derivedByInsertionFrom another Dictionary :e, then it can qualify how it did perform the Insertion using prov:qualifiedInsertion [ a prov:Insertion;  prov:dictionary :e; prov:inserted [a prov:KeyValuePair; prov:key \"k1\"^^xsd:string; prov:value :foo] ]."@en ;
+    rdfs:comment "If this Dictionary prov:derivedByInsertionFrom another Dictionary :e, then it can qualify how it did perform the Insertion using prov:qualifiedInsertion [ a prov:Insertion;  prov:dictionary :e; prov:inserted [a prov:KeyValuePair; prov:pairKey \"k1\"^^xsd:string; prov:pairValue :foo] ]."@en ;
     rdfs:domain :Dictionary ;
     rdfs:range :Insertion ;
     :category "collections" ;
@@ -1075,22 +1075,15 @@
     :unqualifiedForm :used .
 
 :removed
-    a owl:ObjectProperty ;
+    a owl:DatatypeProperty, owl:ObjectProperty ;
+    rdfs:comment "The key removed from a prov:Dictionary in a Removal, resulting in a new prov:Dictionary."@en ;
     rdfs:domain :Removal ;
     rdfs:label "removed"@en ;
-    rdfs:range :KeyValuePair ;
+    rdfs:range rdfs:Literal, :KeyValuePair ;
     :category "collections" ;
     :component "collections" ;
     :prov-dm "http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html#term-dictionary-removal" .
 
-:removedKey
-    a owl:DatatypeProperty ;
-    rdfs:comment "The key removed in a Removal."@en ;
-    rdfs:domain :Removal ;
-    rdfs:range rdfs:Literal ;
-    :category "collections" ;
-    :component "collections" .
-
 :sharesDefinitionWith
     a owl:AnnotationProperty ;
     rdfs:subPropertyOf rdfs:seeAlso .