--- a/examples/eg-40-xml-examples-by-term/xml/Collection.xml Mon Dec 10 12:45:51 2012 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Collection.xml Mon Dec 10 13:31:25 2012 -0700
@@ -9,15 +9,25 @@
xmlns:ex="http://example.com/ns/ex#">
<!-- c0 is an empty collection -->
+
+ <!-- prov:EmptyCollection denotes an empty collection. -->
+ <!--
<prov:entity prov:id="c0">
- <!-- prov:EmptyCollection denotes an empty collection. -->
<prov:type xsi:type="xsd:QName">prov:EmptyCollection</prov:type>
</prov:entity>
+ -->
+
+ <prov:emptyCollection prov:id="c0" />
<!-- c1 is a collection, with unknown content -->
+
+ <!-- prov:Collection denotes an entity of type Collection, i.e. an entity that can participate in relations amongst collections -->
+ <!--
<prov:entity prov:id="c1">
- <!-- prov:Collection denotes an entity of type Collection, i.e. an entity that can participate in relations amongst collections -->
<prov:type xsi:type="xsd:QName">prov:Collection</prov:type>
</prov:entity>
+ -->
+
+ <prov:collection prov:id="c1" />
</prov:document>
--- a/examples/eg-40-xml-examples-by-term/xml/Organization.xml Mon Dec 10 12:45:51 2012 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Organization.xml Mon Dec 10 13:31:25 2012 -0700
@@ -8,8 +8,12 @@
xmlns:prov="http://www.w3.org/ns/prov#"
xmlns:w3="http://w3.org/">
+ <prov:organization prov:id="w3:Consortium" />
+
+ <!--
<prov:agent prov:id="w3:Consortium">
<prov:type xsi:type="xsd:QName">prov:Organization</prov:type>
</prov:agent>
+ -->
</prov:document>
--- a/examples/eg-40-xml-examples-by-term/xml/Person.xml Mon Dec 10 12:45:51 2012 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Person.xml Mon Dec 10 13:31:25 2012 -0700
@@ -10,6 +10,7 @@
xmlns:tr="http://example.com/ns/tr#"
xmlns:rec54="http://example.com/ns/rec54#">
+ <!--
<prov:agent prov:id="ex:Paolo">
<prov:type xsi:type="xsd:QName">prov:Person</prov:type>
</prov:agent>
@@ -17,6 +18,10 @@
<prov:agent prov:id="ex:Simon">
<prov:type xsi:type="xsd:QName">prov:Person</prov:type>
</prov:agent>
+ -->
+
+ <prov:person prov:id="ex:Paolo" />
+ <prov:person prov:id="ex:Simon" />
<prov:entity prov:id="tr:WD-prov-dm-20111215">
<prov:type xsi:type="xsd:QName">rec54:WD</prov:type>
--- a/examples/eg-40-xml-examples-by-term/xml/Plan.xml Mon Dec 10 12:45:51 2012 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Plan.xml Mon Dec 10 13:31:25 2012 -0700
@@ -35,11 +35,18 @@
<ex:content>project1</ex:content>
</prov:wasAssociatedWith>
+ <prov:plan prov:id="ex:wf">
+ <ex:label>Workflow 1</ex:label>
+ <prov:location>http://example.org/workflow1.bpel</prov:location>
+ </prov:plan>
+
+ <!--
<prov:entity prov:id="ex:wf">
<prov:type xsi:type="xsd:QName">prov:Plan</prov:type>
<ex:label>Workflow 1</ex:label>
<prov:location>http://example.org/workflow1.bpel</prov:location>
</prov:entity>
+ -->
<!-- based on Example 36 from http://www.w3.org/TR/prov-dm/#anexample-wasAssociatedWith-2 -->
@@ -54,10 +61,12 @@
<prov:plan prov:ref="ex:wf"/>
</prov:wasAssociatedWith>
+ <!--
<prov:entity prov:id="ex:wf">
<prov:type xsi:type="xsd:QName">prov:Plan</prov:type>
<ex:label>Workflow 1</ex:label>
<prov:location>http://example.org/workflow1.bpel</prov:location>
</prov:entity>
+ -->
</prov:document>
--- a/examples/eg-40-xml-examples-by-term/xml/PrimarySource.xml Mon Dec 10 12:45:51 2012 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/PrimarySource.xml Mon Dec 10 13:31:25 2012 -0700
@@ -16,11 +16,18 @@
<prov:type xsi:type="xsd:QName">journal</prov:type>
</prov:entity>
+ <!--
<prov:wasDerivedFrom>
<prov:generatedEntity prov:ref="ex:la-campagne-de-Russie-1812-1813"/>
<prov:usedEntity prov:ref="ex:revue-d-Histoire-de-la-Pharmacie-t-XVIII"/>
<prov:type xsi:type="xsd:QName">prov:PrimarySource</prov:type>
</prov:wasDerivedFrom>
+ -->
+
+ <prov:hadPrimarySource>
+ <prov:generatedEntity prov:ref="ex:la-campagne-de-Russie-1812-1813"/>
+ <prov:usedEntity prov:ref="ex:revue-d-Histoire-de-la-Pharmacie-t-XVIII"/>
+ </prov:hadPrimarySource>
</prov:document>
--- a/examples/eg-40-xml-examples-by-term/xml/Quotation.xml Mon Dec 10 12:45:51 2012 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Quotation.xml Mon Dec 10 13:31:25 2012 -0700
@@ -18,11 +18,18 @@
<prov:agent prov:id="ex:Paul"/>
+ <!--
<prov:wasDerivedFrom>
<prov:generatedEntity prov:ref="dm:gl-dagstuhl"/>
<prov:usedEntity prov:ref="wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop"/>
<prov:type xsi:type="xsd:QName">prov:Quotation</prov:type>
</prov:wasDerivedFrom>
+ -->
+
+ <prov:wasQuotedFrom>
+ <prov:generatedEntity prov:ref="dm:gl-dagstuhl"/>
+ <prov:usedEntity prov:ref="wp:thoughts-from-the-dagstuhl-principles-of-provenance-workshop"/>
+ </prov:wasQuotedFrom>
<prov:wasAttributedTo>
<prov:entity prov:ref="dm:bl-dagstuhl"/>
--- a/examples/eg-40-xml-examples-by-term/xml/Revision.xml Mon Dec 10 12:45:51 2012 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Revision.xml Mon Dec 10 13:31:25 2012 -0700
@@ -18,17 +18,17 @@
<prov:type xsi:type="xsd:QName">rec54:WD</prov:type>
</prov:entity>
+ <!--
<prov:wasDerivedFrom>
<prov:generatedEntity prov:ref="tr:WD-prov-dm-20111215"/>
<prov:usedEntity prov:ref="tr:WD-prov-dm-20111018"/>
<prov:type xsi:type="xsd:QName">prov:Revision</prov:type>
</prov:wasDerivedFrom>
+ -->
- <!--
<prov:wasRevisionOf>
<prov:generatedEntity prov:ref="tr:WD-prov-dm-20111215"/>
<prov:usedEntity prov:ref="tr:WD-prov-dm-20111018"/>
</prov:wasRevisionOf>
- -->
</prov:document>
--- a/examples/eg-40-xml-examples-by-term/xml/SoftwareAgent.xml Mon Dec 10 12:45:51 2012 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/SoftwareAgent.xml Mon Dec 10 13:31:25 2012 -0700
@@ -7,8 +7,12 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:prov="http://www.w3.org/ns/prov#">
+ <!--
<prov:agent prov:id="ag">
<prov:type xsi:type="xsd:QName">prov:SoftwareAgent</prov:type>
</prov:agent>
+ -->
+
+ <prov:softwareAgent prov:id="ag" />
</prov:document>
--- a/xml/releases/WD-prov-xml-20121211/Overview.html Mon Dec 10 12:45:51 2012 -0700
+++ b/xml/releases/WD-prov-xml-20121211/Overview.html Mon Dec 10 13:31:25 2012 -0700
@@ -843,19 +843,19 @@
</tr>
<tr class="component3-color">
<td class="provType">Plan</td>
- <td><a title="plan" href="#concept-plan" class="internalDFN">use <prov:type>prov:Plan</prov:type> in Entity</a></td>
+ <td>use <prov:type>prov:Plan</prov:type> in Entity</td>
</tr>
<tr class="component3-color">
<td class="provType">Person</td>
- <td><a title="person" href="#concept-person" class="internalDFN">use <prov:type>prov:Person</prov:type> in Agent</a></td>
+ <td>use <prov:type>prov:Person</prov:type> in Agent</td>
</tr>
<tr class="component3-color">
<td class="provType">Organization</td>
- <td><a title="organization" href="#concept-organization" class="internalDFN">use <prov:type>prov:Organization</prov:type> in Agent</a></td>
+ <td>use <prov:type>prov:Organization</prov:type> in Agent</td>
</tr>
<tr class="component3-color">
<td class="provType">SoftwareAgent</td>
- <td><a title="software-agent" href="#concept-software-agent" class="internalDFN">use <prov:type>prov:SoftwareAgent</prov:type> in Agent</a></td>
+ <td>use <prov:type>prov:SoftwareAgent</prov:type> in Agent</td>
</tr>
<tr class="component3-color">
<td><a href="#concept-influence" class="internalDFN">Influence</a></td>
@@ -895,7 +895,7 @@
</tr>
<tr class="component6-color">
<td class="provType">EmptyCollection</td>
- <td><a title="empty collection" href="#concept-empty-collection" class="internalDFN">use <prov:type>prov:EmptyCollection</prov:type> in Entity</a></td>
+ <td>use <prov:type>prov:EmptyCollection</prov:type> in Entity</td>
</tr>
<tr class="component6-color">
<td><a href="#concept-membership" class="internalDFN">Membership</a></td>