--- a/examples/eg-40-xml-examples-by-term/xml/Bundle.xml Mon Jan 14 13:41:48 2013 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Bundle.xml Mon Jan 14 13:44:21 2013 -0700
@@ -43,15 +43,17 @@
first bundle can be expressed. -->
<prov:bundle prov:id="bob:bundle1">
+
<prov:entity prov:id="ex:report1">
<prov:type xsi:type="xsd:QName">report</prov:type>
<ex:version>1</ex:version>
</prov:entity>
-
+
<prov:wasGeneratedBy>
<prov:entity prov:ref="ex:report1"/>
<prov:time>2012-05-24T10:00:01</prov:time>
</prov:wasGeneratedBy>
+
</prov:bundle>
<!-- In contrast, Alice observed the creation of ex:report2 and
@@ -59,22 +61,24 @@
expressed. -->
<prov:bundle prov:id="alice:bundle2">
- <prov:entity prov:id="ex:report1"/>
-
+
+ <prov:entity prov:id="ex:report1"/>
+
<prov:entity prov:id="ex:report2">
<prov:type xsi:type="xsd:QName">report</prov:type>
<ex:version>2</ex:version>
</prov:entity>
-
+
<prov:wasGeneratedBy>
<prov:entity prov:ref="ex:report2"/>
<prov:time>2012-05-25T11:00:01</prov:time>
</prov:wasGeneratedBy>
-
+
<prov:wasDerivedFrom>
<prov:generatedEntity prov:ref="ex:report2"/>
<prov:usedEntity prov:ref="ex:report1"/>
</prov:wasDerivedFrom>
+
</prov:bundle>
<!-- The first
@@ -82,27 +86,19 @@
the creation of ex:report1. Its provenance can be described as
follows. -->
- <prov:entity prov:id="bob:bundle1">
- <prov:type xsi:type="xsd:QName">prov:Bundle</prov:type>
- </prov:entity>
-
<prov:wasGeneratedBy>
- <prov:entity prov:ref="bob:bundle1"/>
- <prov:time>2012-05-24T10:30:00</prov:time>
+ <prov:entity prov:ref="bob:bundle1"/>
+ <prov:time>2012-05-24T10:30:00</prov:time>
</prov:wasGeneratedBy>
<prov:wasAttributedTo>
- <prov:entity prov:ref="bob:bundle1"/>
- <prov:agent prov:ref="ex:Bob"/>
+ <prov:entity prov:ref="bob:bundle1"/>
+ <prov:agent prov:ref="ex:Bob"/>
</prov:wasAttributedTo>
<!-- In contrast, the second bundle is attributed to Alice
who observed the derivation of ex:report2 from ex:report1. -->
- <prov:entity prov:id="alice:bundle2">
- <prov:type xsi:type="xsd:QName">prov:Bundle</prov:type>
- </prov:entity>
-
<prov:wasGeneratedBy>
<prov:entity prov:ref="alice:bundle2"/>
<prov:time>2012-05-25T11:15:00</prov:time>
@@ -119,11 +115,12 @@
novel bundle, whose provenance is described as follows. -->
<prov:bundle prov:id="agg:bundle3">
+
<prov:entity prov:id="ex:report1">
<prov:type xsi:type="xsd:QName">report</prov:type>
<ex:version>1</ex:version>
</prov:entity>
-
+
<prov:wasGeneratedBy>
<prov:entity prov:ref="ex:report1"/>
<prov:time>2012-05-24T10:00:01</prov:time>
@@ -143,11 +140,14 @@
<prov:generatedEntity prov:ref="ex:report2"/>
<prov:usedEntity prov:ref="ex:report1"/>
</prov:wasDerivedFrom>
+
</prov:bundle>
+ <!-- defining the bundle entity inside the bundle entity?
<prov:entity prov:id="agg:bundle3">
<prov:type xsi:type="xsd:QName">prov:Bundle</prov:type>
</prov:entity>
+ -->
<prov:agent prov:id="ex:aggregator01">
<prov:type xsi:type="xsd:QName">ex:Aggregator</prov:type>
--- a/examples/eg-40-xml-examples-by-term/xml/Collection.xml Mon Jan 14 13:41:48 2013 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Collection.xml Mon Jan 14 13:44:21 2013 -0700
@@ -8,13 +8,14 @@
xmlns:prov="http://www.w3.org/ns/prov#"
xmlns:ex="http://example.com/ns/ex#">
- <!-- prov:Collection denotes an entity of type Collection, i.e. an entity that can participate in relations amongst collections -->
+ <!-- old modeling (still valid) -->
+ <!--
<prov:entity prov:id="c1">
<prov:type xsi:type="xsd:QName">prov:Collection</prov:type>
</prov:entity>
+ -->
- <!--
+ <!-- new modeling -->
<prov:collection prov:id="c1" />
--->
</prov:document>
--- a/examples/eg-40-xml-examples-by-term/xml/Derivation1.xml Mon Jan 14 13:41:48 2013 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Derivation1.xml Mon Jan 14 13:44:21 2013 -0700
@@ -11,7 +11,7 @@
<prov:entity prov:id="e2"/>
- <prov:wasDerivedFrom>
+ <prov:wasDerivedFrom xsi:type="prov:Derivation">
<prov:generatedEntity prov:ref="e2"/>
<prov:usedEntity prov:ref="e1"/>
</prov:wasDerivedFrom>
--- a/examples/eg-40-xml-examples-by-term/xml/EmptyCollection.xml Mon Jan 14 13:41:48 2013 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/EmptyCollection.xml Mon Jan 14 13:44:21 2013 -0700
@@ -8,12 +8,14 @@
xmlns:prov="http://www.w3.org/ns/prov#"
xmlns:ex="http://example.com/ns/ex#">
+ <!-- old modeling (still valid) -->
+ <!--
<prov:entity prov:id="c0">
<prov:type xsi:type="xsd:QName">prov:EmptyCollection</prov:type>
</prov:entity>
-
- <!--
- <prov:emptyCollection prov:id="c0" />
-->
+ <!-- new modeling -->
+ <prov:emptyCollection prov:id="c0" />
+
</prov:document>
\ No newline at end of file
--- a/examples/eg-40-xml-examples-by-term/xml/Organization.xml Mon Jan 14 13:41:48 2013 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Organization.xml Mon Jan 14 13:44:21 2013 -0700
@@ -8,12 +8,14 @@
xmlns:prov="http://www.w3.org/ns/prov#"
xmlns:w3="http://w3.org/">
- <!--
+ <!-- new modeling -->
<prov:organization prov:id="w3:Consortium" />
- -->
+ <!-- old modeling (still valid) -->
+ <!--
<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 Jan 14 13:41:48 2013 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Person.xml Mon Jan 14 13:44:21 2013 -0700
@@ -10,6 +10,8 @@
xmlns:tr="http://example.com/ns/tr#"
xmlns:rec54="http://example.com/ns/rec54#">
+ <!-- old modeling (still valid) -->
+ <!--
<prov:agent prov:id="ex:Paolo">
<prov:type xsi:type="xsd:QName">prov:Person</prov:type>
</prov:agent>
@@ -17,11 +19,11 @@
<prov:agent prov:id="ex:Simon">
<prov:type xsi:type="xsd:QName">prov:Person</prov:type>
</prov:agent>
+ -->
- <!--
+ <!-- new modeling -->
<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 Jan 14 13:41:48 2013 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Plan.xml Mon Jan 14 13:44:21 2013 -0700
@@ -35,32 +35,13 @@
<ex:content>project1</ex:content>
</prov:wasAssociatedWith>
- <!--
+ <!-- new modeling -->
<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 -->
-
- <prov:activity prov:id="ex:a">
- <prov:type xsi:type="xsd:string">workflow execution</prov:type>
- </prov:activity>
-
- <prov:entity prov:id="ex:wf"/>
-
- <prov:wasAssociatedWith>
- <prov:activity prov:ref="ex:a"/>
- <prov:plan prov:ref="ex:wf"/>
- </prov:wasAssociatedWith>
-
+ <!-- old modeling (still valid) -->
<!--
<prov:entity prov:id="ex:wf">
<prov:type xsi:type="xsd:QName">prov:Plan</prov:type>
@@ -69,4 +50,15 @@
</prov:entity>
-->
+ <!-- based on Example 36 from http://www.w3.org/TR/prov-dm/#anexample-wasAssociatedWith-2 -->
+
+ <prov:activity prov:id="ex:a">
+ <prov:type xsi:type="xsd:string">workflow execution</prov:type>
+ </prov:activity>
+
+ <prov:wasAssociatedWith>
+ <prov:activity prov:ref="ex:a"/>
+ <prov:plan prov:ref="ex:wf"/>
+ </prov:wasAssociatedWith>
+
</prov:document>
--- a/examples/eg-40-xml-examples-by-term/xml/PrimarySource.xml Mon Jan 14 13:41:48 2013 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/PrimarySource.xml Mon Jan 14 13:44:21 2013 -0700
@@ -16,18 +16,19 @@
<prov:type xsi:type="xsd:QName">journal</prov:type>
</prov:entity>
+ <!-- old modeling (still valid) -->
+ <!--
<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 Jan 14 13:41:48 2013 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Quotation.xml Mon Jan 14 13:44:21 2013 -0700
@@ -14,22 +14,24 @@
<prov:entity prov:id="dm:bl-dagstuhl"/>
- <prov:agent prov:id="ex:Luc"/>
+ <prov:person prov:id="ex:Luc"/>
- <prov:agent prov:id="ex:Paul"/>
+ <prov:person prov:id="ex:Paul"/>
+ <!-- old modeling (still valid) -->
+ <!--
<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>
+ -->
- <!--
+ <!-- new modeling -->
<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 Jan 14 13:41:48 2013 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/Revision.xml Mon Jan 14 13:44:21 2013 -0700
@@ -18,17 +18,19 @@
<prov:type xsi:type="xsd:QName">rec54:WD</prov:type>
</prov:entity>
+ <!-- old modeling (still valid) -->
+ <!--
<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>
+ -->
- <!--
+ <!-- new modeling -->
<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 Jan 14 13:41:48 2013 -0700
+++ b/examples/eg-40-xml-examples-by-term/xml/SoftwareAgent.xml Mon Jan 14 13:44:21 2013 -0700
@@ -7,12 +7,14 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:prov="http://www.w3.org/ns/prov#">
+ <!-- old modeling (still valid) -->
+ <!--
<prov:agent prov:id="ag">
<prov:type xsi:type="xsd:QName">prov:SoftwareAgent</prov:type>
</prov:agent>
-
- <!--
- <prov:softwareAgent prov:id="ag" />
-->
+ <!-- new modeling -->
+ <prov:softwareAgent prov:id="ag" />
+
</prov:document>