added prov:entity property
authorTim L <lebot@rpi.edu>
Sun, 06 Nov 2011 13:13:54 -0500
changeset 822 b9f79cf35083
parent 821 3b6a671c30b9
child 823 c2297fae2897
added prov:entity property
ontology/component-aggregations/aggregate.sh
ontology/component-aggregations/prov-variant-1.owl
ontology/component-aggregations/prov-variant-1.owl.prov.ttl
ontology/component-aggregations/prov.owl
ontology/component-aggregations/prov.owl.prov.ttl
ontology/components/Entity.ttl
ontology/components/QualifiedInvolvement.ttl
ontology/components/wasDerivedFrom/prov-dm-e5-wasDerivedFrom-e3.ttl
--- a/ontology/component-aggregations/aggregate.sh	Sun Nov 06 12:49:40 2011 -0500
+++ b/ontology/component-aggregations/aggregate.sh	Sun Nov 06 13:13:54 2011 -0500
@@ -30,7 +30,17 @@
 rm -f "_"`basename $0`*.tmp
 TEMP="_"`basename $0``date +%s`_$$.tmp
 
-for component_list_file in `find . -name "*.ttl" | grep -v "\.prov.ttl" | sed 's/^\.\///'`; do
+component_list=""
+while [[ $? -gt 0 && -e "$1" ]]; do
+   component_list="$component_list $1"
+   shift
+done
+if [[ ${#component_list} -eq 0 ]]; then
+   component_list=`find . -name "*.ttl" | grep -v "\.prov.ttl" | sed 's/^\.\///'`
+   
+fi
+
+for component_list_file in $component_list; do
    rm -f $TEMP
    component_url="${base}/${component_list_file}"
    echo "$component_url"
--- a/ontology/component-aggregations/prov-variant-1.owl	Sun Nov 06 12:49:40 2011 -0500
+++ b/ontology/component-aggregations/prov-variant-1.owl	Sun Nov 06 13:13:54 2011 -0500
@@ -24,44 +24,44 @@
       </ns1:Restriction>
     </ns7:subClassOf>
   </ns1:Class>
+  <ns8:Class xmlns:ns8="http://www.w3.org/2002/07/owl#" rdf:about="http://www.w3.org/ns/prov-o/EntityInRole">
+    <ns9:comment xmlns:ns9="http://www.w3.org/2000/01/rdf-schema#">An Entity that assumes a Role within the context of this provenance assertion.</ns9:comment>
+    <ns10:label xmlns:ns10="http://www.w3.org/2000/01/rdf-schema#">EntityInRole</ns10:label>
+    <ns11:seeAlso xmlns:ns11="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://www.w3.org/2011/prov/track/issues/110"/>
+    <ns12:subClassOf xmlns:ns12="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://www.w3.org/ns/prov-o/Entity"/>
+    <ns13:subClassOf xmlns:ns13="http://www.w3.org/2000/01/rdf-schema#">
+      <ns8:Restriction>
+        <ns8:minCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</ns8:minCardinality>
+        <ns8:onProperty rdf:resource="http://www.w3.org/ns/prov-o/assumedRole"/>
+      </ns8:Restriction>
+    </ns13:subClassOf>
+    <ns14:subClassOf xmlns:ns14="http://www.w3.org/2000/01/rdf-schema#">
+      <ns8:Restriction>
+        <ns8:minCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</ns8:minCardinality>
+        <ns8:onProperty rdf:resource="http://www.w3.org/ns/prov-o/wasAssumedBy"/>
+      </ns8:Restriction>
+    </ns14:subClassOf>
+  </ns8:Class>
   <rdf:Description rdf:about="http://www.w3.org/ns/prov-o/Role">
-    <ns8:subClassOf xmlns:ns8="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://www.w3.org/ns/prov-o/Entity"/>
-    <ns9:subClassOf xmlns:ns9="http://www.w3.org/2000/01/rdf-schema#">
-      <ns10:Restriction xmlns:ns10="http://www.w3.org/2002/07/owl#">
-        <ns10:minCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</ns10:minCardinality>
-        <ns10:onProperty rdf:resource="http://www.w3.org/ns/prov-o/assumedBy"/>
-      </ns10:Restriction>
-    </ns9:subClassOf>
+    <ns15:subClassOf xmlns:ns15="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://www.w3.org/ns/prov-o/Entity"/>
+    <ns16:subClassOf xmlns:ns16="http://www.w3.org/2000/01/rdf-schema#">
+      <ns17:Restriction xmlns:ns17="http://www.w3.org/2002/07/owl#">
+        <ns17:minCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</ns17:minCardinality>
+        <ns17:onProperty rdf:resource="http://www.w3.org/ns/prov-o/wasAssumedBy"/>
+      </ns17:Restriction>
+    </ns16:subClassOf>
   </rdf:Description>
-  <ns11:ObjectProperty xmlns:ns11="http://www.w3.org/2002/07/owl#" rdf:about="http://www.w3.org/ns/prov-o/assumedBy">
-    <ns12:domain xmlns:ns12="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://www.w3.org/ns/prov-o/Role"/>
-    <ns13:range xmlns:ns13="http://www.w3.org/2000/01/rdf-schema#">
+  <ns18:ObjectProperty xmlns:ns18="http://www.w3.org/2002/07/owl#" rdf:about="http://www.w3.org/ns/prov-o/hasAssertions">
+    <ns19:comment xmlns:ns19="http://www.w3.org/2000/01/rdf-schema#">A reference to the assertions that an asserter has made. This could be to a named graph, a file, a URL, etc.</ns19:comment>
+    <ns20:label xmlns:ns20="http://www.w3.org/2000/01/rdf-schema#">hasAssertions</ns20:label>
+    <ns21:subPropertyOf xmlns:ns21="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://www.w3.org/ns/prov-o/hasLocation"/>
+  </ns18:ObjectProperty>
+  <ns22:ObjectProperty xmlns:ns22="http://www.w3.org/2002/07/owl#" rdf:about="http://www.w3.org/ns/prov-o/wasAssumedBy">
+    <ns23:domain xmlns:ns23="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://www.w3.org/ns/prov-o/Role"/>
+    <ns24:range xmlns:ns24="http://www.w3.org/2000/01/rdf-schema#">
       <rdf:Description>
-        <ns11:complementOf rdf:resource="http://www.w3.org/ns/prov-o/Entity"/>
+        <ns22:complementOf rdf:resource="http://www.w3.org/ns/prov-o/Entity"/>
       </rdf:Description>
-    </ns13:range>
-  </ns11:ObjectProperty>
-  <ns14:ObjectProperty xmlns:ns14="http://www.w3.org/2002/07/owl#" rdf:about="http://www.w3.org/ns/prov-o/hasAssertions">
-    <ns15:comment xmlns:ns15="http://www.w3.org/2000/01/rdf-schema#">A reference to the assertions that an asserter has made. This could be to a named graph, a file, a URL, etc.</ns15:comment>
-    <ns16:label xmlns:ns16="http://www.w3.org/2000/01/rdf-schema#">hasAssertions</ns16:label>
-    <ns17:subPropertyOf xmlns:ns17="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://www.w3.org/ns/prov-o/hasLocation"/>
-  </ns14:ObjectProperty>
-  <ns18:Class xmlns:ns18="http://www.w3.org/2002/07/owl#" rdf:about="http://www.w3.org/ns/prov-o/EntityInRole">
-    <ns19:comment xmlns:ns19="http://www.w3.org/2000/01/rdf-schema#">An Entity that assumes a Role within the context of this provenance assertion.</ns19:comment>
-    <ns20:label xmlns:ns20="http://www.w3.org/2000/01/rdf-schema#">EntityInRole</ns20:label>
-    <ns21:seeAlso xmlns:ns21="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://www.w3.org/2011/prov/track/issues/110"/>
-    <ns22:subClassOf xmlns:ns22="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://www.w3.org/ns/prov-o/Entity"/>
-    <ns23:subClassOf xmlns:ns23="http://www.w3.org/2000/01/rdf-schema#">
-      <ns18:Restriction>
-        <ns18:minCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</ns18:minCardinality>
-        <ns18:onProperty rdf:resource="http://www.w3.org/ns/prov-o/assumedRole"/>
-      </ns18:Restriction>
-    </ns23:subClassOf>
-    <ns24:subClassOf xmlns:ns24="http://www.w3.org/2000/01/rdf-schema#">
-      <ns18:Restriction>
-        <ns18:minCardinality rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">1</ns18:minCardinality>
-        <ns18:onProperty rdf:resource="http://www.w3.org/ns/prov-o/assumedBy"/>
-      </ns18:Restriction>
-    </ns24:subClassOf>
-  </ns18:Class>
+    </ns24:range>
+  </ns22:ObjectProperty>
 </rdf:RDF>
--- a/ontology/component-aggregations/prov-variant-1.owl.prov.ttl	Sun Nov 06 12:49:40 2011 -0500
+++ b/ontology/component-aggregations/prov-variant-1.owl.prov.ttl	Sun Nov 06 13:13:54 2011 -0500
@@ -36,3 +36,231 @@
    nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/assumedBy.ttl>;
    a prov:Entity;
 .
+@prefix nfo:  <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
+@prefix prov: <http://www.w3.org/ns/prov-o/> .
+@prefix :     <#> .
+
+:result
+   nfo:fileURL <prov-variant-1.owl>;
+   prov:wasDerivedFrom :component_list;
+   prov:wasDerivedFrom :input;
+   a prov:Entity;
+.
+
+:component_list
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/component-aggregations/prov-variant-1.ttl>;
+   a prov:Entity;
+.
+
+:input
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/Account.ttl>;
+   a prov:Entity;
+.
+
+:result
+   prov:wasDerivedFrom :input_2;
+.
+
+:input_2
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/EntityInRole.ttl>;
+   a prov:Entity;
+.
+
+:result
+   prov:wasDerivedFrom :input_3;
+.
+
+:input_3
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/assumedBy.ttl>;
+   a prov:Entity;
+.
+@prefix nfo:  <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
+@prefix prov: <http://www.w3.org/ns/prov-o/> .
+@prefix :     <#> .
+
+:result
+   nfo:fileURL <prov-variant-1.owl>;
+   prov:wasDerivedFrom :component_list;
+   prov:wasDerivedFrom :input;
+   a prov:Entity;
+.
+
+:component_list
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/component-aggregations/prov-variant-1.ttl>;
+   a prov:Entity;
+.
+
+:input
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/Account.ttl>;
+   a prov:Entity;
+.
+
+:result
+   prov:wasDerivedFrom :input_2;
+.
+
+:input_2
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/EntityInRole.ttl>;
+   a prov:Entity;
+.
+
+:result
+   prov:wasDerivedFrom :input_3;
+.
+
+:input_3
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/assumedBy.ttl>;
+   a prov:Entity;
+.
+@prefix nfo:  <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
+@prefix prov: <http://www.w3.org/ns/prov-o/> .
+@prefix :     <#> .
+
+:result
+   nfo:fileURL <prov-variant-1.owl>;
+   prov:wasDerivedFrom :component_list;
+   prov:wasDerivedFrom :input;
+   a prov:Entity;
+.
+
+:component_list
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/component-aggregations/prov-variant-1.ttl>;
+   a prov:Entity;
+.
+
+:input
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/Account.ttl>;
+   a prov:Entity;
+.
+
+:result
+   prov:wasDerivedFrom :input_2;
+.
+
+:input_2
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/EntityInRole.ttl>;
+   a prov:Entity;
+.
+
+:result
+   prov:wasDerivedFrom :input_3;
+.
+
+:input_3
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/assumedBy.ttl>;
+   a prov:Entity;
+.
+@prefix nfo:  <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
+@prefix prov: <http://www.w3.org/ns/prov-o/> .
+@prefix :     <#> .
+
+:result
+   nfo:fileURL <prov-variant-1.owl>;
+   prov:wasDerivedFrom :component_list;
+   prov:wasDerivedFrom :input;
+   a prov:Entity;
+.
+
+:component_list
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/component-aggregations/prov-variant-1.ttl>;
+   a prov:Entity;
+.
+
+:input
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/Account.ttl>;
+   a prov:Entity;
+.
+
+:result
+   prov:wasDerivedFrom :input_2;
+.
+
+:input_2
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/EntityInRole.ttl>;
+   a prov:Entity;
+.
+
+:result
+   prov:wasDerivedFrom :input_3;
+.
+
+:input_3
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/assumedBy.ttl>;
+   a prov:Entity;
+.
+@prefix nfo:  <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
+@prefix prov: <http://www.w3.org/ns/prov-o/> .
+@prefix :     <#> .
+
+:result
+   nfo:fileURL <prov-variant-1.owl>;
+   prov:wasDerivedFrom :component_list;
+   prov:wasDerivedFrom :input;
+   a prov:Entity;
+.
+
+:component_list
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/component-aggregations/prov-variant-1.ttl>;
+   a prov:Entity;
+.
+
+:input
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/Account.ttl>;
+   a prov:Entity;
+.
+
+:result
+   prov:wasDerivedFrom :input_2;
+.
+
+:input_2
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/EntityInRole.ttl>;
+   a prov:Entity;
+.
+
+:result
+   prov:wasDerivedFrom :input_3;
+.
+
+:input_3
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/assumedBy.ttl>;
+   a prov:Entity;
+.
+@prefix nfo:  <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
+@prefix prov: <http://www.w3.org/ns/prov-o/> .
+@prefix :     <#> .
+
+:result
+   nfo:fileURL <prov-variant-1.owl>;
+   prov:wasDerivedFrom :component_list;
+   prov:wasDerivedFrom :input;
+   a prov:Entity;
+.
+
+:component_list
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/component-aggregations/prov-variant-1.ttl>;
+   a prov:Entity;
+.
+
+:input
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/Account.ttl>;
+   a prov:Entity;
+.
+
+:result
+   prov:wasDerivedFrom :input_2;
+.
+
+:input_2
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/EntityInRole.ttl>;
+   a prov:Entity;
+.
+
+:result
+   prov:wasDerivedFrom :input_3;
+.
+
+:input_3
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/assumedBy.ttl>;
+   a prov:Entity;
+.
--- a/ontology/component-aggregations/prov.owl	Sun Nov 06 12:49:40 2011 -0500
+++ b/ontology/component-aggregations/prov.owl	Sun Nov 06 13:13:54 2011 -0500
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <ns1:ObjectProperty xmlns:ns1="http://www.w3.org/2002/07/owl#" rdf:about="http://www.w3.org/ns/prov-o/wasDerivedFrom">
-    <ns2:domain xmlns:ns2="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://www.w3.org/ns/prov-o/Entity"/>
+  <ns1:ObjectProperty xmlns:ns1="http://www.w3.org/2002/07/owl#" rdf:about="http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/ProvenanceOntology.owl#wasDerivedFrom">
+    <ns2:domain xmlns:ns2="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/ProvenanceOntology.owl#Entity"/>
     <ns3:label xmlns:ns3="http://www.w3.org/2000/01/rdf-schema#">wasDerivedFrom</ns3:label>
-    <ns4:range xmlns:ns4="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://www.w3.org/ns/prov-o/Entity"/>
+    <ns4:range xmlns:ns4="http://www.w3.org/2000/01/rdf-schema#" rdf:resource="http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/ProvenanceOntology.owl#Entity"/>
   </ns1:ObjectProperty>
 </rdf:RDF>
--- a/ontology/component-aggregations/prov.owl.prov.ttl	Sun Nov 06 12:49:40 2011 -0500
+++ b/ontology/component-aggregations/prov.owl.prov.ttl	Sun Nov 06 13:13:54 2011 -0500
@@ -18,3 +18,123 @@
    nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/components/wasDerivedFrom.ttl>;
    a prov:Entity;
 .
+@prefix nfo:  <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
+@prefix prov: <http://www.w3.org/ns/prov-o/> .
+@prefix :     <#> .
+
+:result
+   nfo:fileURL <prov.owl>;
+   prov:wasDerivedFrom :component_list;
+   prov:wasDerivedFrom :input;
+   a prov:Entity;
+.
+
+:component_list
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/component-aggregations/prov.ttl>;
+   a prov:Entity;
+.
+
+:input
+   nfo:fileURL <http://dvcs.w3.org/hg/prov/raw-file/3d6ec214ad01/ontology/components/wasDerivedFrom.ttl>;
+   a prov:Entity;
+.
+@prefix nfo:  <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
+@prefix prov: <http://www.w3.org/ns/prov-o/> .
+@prefix :     <#> .
+
+:result
+   nfo:fileURL <prov.owl>;
+   prov:wasDerivedFrom :component_list;
+   prov:wasDerivedFrom :input;
+   a prov:Entity;
+.
+
+:component_list
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/component-aggregations/prov.ttl>;
+   a prov:Entity;
+.
+
+:input
+   nfo:fileURL <http://dvcs.w3.org/hg/prov/raw-file/3d6ec214ad01/ontology/components/wasDerivedFrom.ttl>;
+   a prov:Entity;
+.
+@prefix nfo:  <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
+@prefix prov: <http://www.w3.org/ns/prov-o/> .
+@prefix :     <#> .
+
+:result
+   nfo:fileURL <prov.owl>;
+   prov:wasDerivedFrom :component_list;
+   prov:wasDerivedFrom :input;
+   a prov:Entity;
+.
+
+:component_list
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/component-aggregations/prov.ttl>;
+   a prov:Entity;
+.
+
+:input
+   nfo:fileURL <http://dvcs.w3.org/hg/prov/raw-file/3d6ec214ad01/ontology/components/wasDerivedFrom.ttl>;
+   a prov:Entity;
+.
+@prefix nfo:  <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
+@prefix prov: <http://www.w3.org/ns/prov-o/> .
+@prefix :     <#> .
+
+:result
+   nfo:fileURL <prov.owl>;
+   prov:wasDerivedFrom :component_list;
+   prov:wasDerivedFrom :input;
+   a prov:Entity;
+.
+
+:component_list
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/component-aggregations/prov.ttl>;
+   a prov:Entity;
+.
+
+:input
+   nfo:fileURL <http://dvcs.w3.org/hg/prov/raw-file/3d6ec214ad01/ontology/components/wasDerivedFrom.ttl>;
+   a prov:Entity;
+.
+@prefix nfo:  <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
+@prefix prov: <http://www.w3.org/ns/prov-o/> .
+@prefix :     <#> .
+
+:result
+   nfo:fileURL <prov.owl>;
+   prov:wasDerivedFrom :component_list;
+   prov:wasDerivedFrom :input;
+   a prov:Entity;
+.
+
+:component_list
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/component-aggregations/prov.ttl>;
+   a prov:Entity;
+.
+
+:input
+   nfo:fileURL <http://dvcs.w3.org/hg/prov/raw-file/3d6ec214ad01/ontology/components/wasDerivedFrom.ttl>;
+   a prov:Entity;
+.
+@prefix nfo:  <http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#> .
+@prefix prov: <http://www.w3.org/ns/prov-o/> .
+@prefix :     <#> .
+
+:result
+   nfo:fileURL <prov.owl>;
+   prov:wasDerivedFrom :component_list;
+   prov:wasDerivedFrom :input;
+   a prov:Entity;
+.
+
+:component_list
+   nfo:fileURL <https://dvcs.w3.org/hg/prov/raw-file/tip/ontology/component-aggregations/prov.ttl>;
+   a prov:Entity;
+.
+
+:input
+   nfo:fileURL <http://dvcs.w3.org/hg/prov/raw-file/3d6ec214ad01/ontology/components/wasDerivedFrom.ttl>;
+   a prov:Entity;
+.
--- a/ontology/components/Entity.ttl	Sun Nov 06 12:49:40 2011 -0500
+++ b/ontology/components/Entity.ttl	Sun Nov 06 13:13:54 2011 -0500
@@ -1,9 +1,5 @@
 @prefix owl:  <http://www.w3.org/2002/07/owl#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix time: <http://www.w3.org/2006/time#> .
+@prefix dcterms: <http://purl.org/dc/terms/> .
 @prefix prov: <http://dvcs.w3.org/hg/prov/raw-file/tip/ontology/ProvenanceOntology.owl#> .
-
-prov:Entity
-   a owl:Class;
-   rdfs:seeAlso <http://www.w3.org/TR/2011/WD-prov-dm-20111018/#expression-Entity>;
-.
--- a/ontology/components/QualifiedInvolvement.ttl	Sun Nov 06 12:49:40 2011 -0500
+++ b/ontology/components/QualifiedInvolvement.ttl	Sun Nov 06 13:13:54 2011 -0500
@@ -8,6 +8,15 @@
    a owl:Class;
    rdfs:subClassOf [
        owl:onProperty prov:entity;
-       owl:minCardinality 1
+       owl:minCardinality 1;
    ];
 .
+
+prov:entity
+   a owl:ObjectProperty;
+   rdfs:label "entity";
+   rdfs:comment "The Entity whose involvement (PE's used, hadParticipant, wasControlledBy, or generation) is being qualified.";
+   rdfs:comment "This is effectively the rdf:object or owl:AnnotationTarget of the triple being reified.";
+   rdfs:domain prov:QualifiedInvolvement;
+   rdfs:range  prov:Entity;
+.
--- a/ontology/components/wasDerivedFrom/prov-dm-e5-wasDerivedFrom-e3.ttl	Sun Nov 06 12:49:40 2011 -0500
+++ b/ontology/components/wasDerivedFrom/prov-dm-e5-wasDerivedFrom-e3.ttl	Sun Nov 06 13:13:54 2011 -0500
@@ -15,6 +15,7 @@
    a prov:Entity;
    prov:wasDerivedFrom :e3;
 .
+
 :pe4
    rdfs:seeAlso <http://www.w3.org/TR/2011/WD-prov-dm-20111018/#pe-linked-derivationExpression>;
    dcterms:description "wasDerivedFrom(e5,e3,pe4,qualifier(channel='out'),qualifier(channel='in'))";
@@ -22,13 +23,15 @@
 
    prov:used :e3;
    prov:qualifedUsage [
-      a prov:Use;
+      a prov:Usage;
+      prov:entity :e3; 
       :channel "in";
    ];
 
    prov:generated :e5;
    prov:qualifedGeneration [
       a prov:Generation;
+      prov:entity :e5; 
       :channel "out";
    ];
 .
@@ -39,3 +42,4 @@
    a prov:Entity;
    prov:wasDerivedFrom :e2;
 .
+:e2 a prov:Entity .