--- a/model/blog/blog1.svg Mon Sep 17 11:42:43 2012 -0400
+++ b/model/blog/blog1.svg Tue Sep 18 10:17:25 2012 +0100
@@ -18,7 +18,10 @@
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
- sodipodi:docname="blog1.svg">
+ sodipodi:docname="blog1.svg"
+ inkscape:export-filename="/home/lavm/luc-svn/papers/prov-wg/hg/model/blog/blog1.png"
+ inkscape:export-xdpi="79.550438"
+ inkscape:export-ydpi="79.550438">
<metadata
id="metadata68">
<rdf:RDF>
@@ -27,6 +30,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
@@ -42,14 +46,14 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1680"
- inkscape:window-height="1018"
+ inkscape:window-height="991"
id="namedview64"
showgrid="false"
inkscape:zoom="3.4526316"
- inkscape:cx="84.375"
+ inkscape:cx="84.954268"
inkscape:cy="116.875"
- inkscape:window-x="1680"
- inkscape:window-y="0"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
<g
--- a/model/blog/blog2.svg Mon Sep 17 11:42:43 2012 -0400
+++ b/model/blog/blog2.svg Tue Sep 18 10:17:25 2012 +0100
@@ -18,7 +18,10 @@
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
- sodipodi:docname="blog2.svg">
+ sodipodi:docname="blog2.svg"
+ inkscape:export-filename="/home/lavm/luc-svn/papers/prov-wg/hg/model/blog/blog2.png"
+ inkscape:export-xdpi="79.550438"
+ inkscape:export-ydpi="79.550438">
<metadata
id="metadata68">
<rdf:RDF>
@@ -43,14 +46,14 @@
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1680"
- inkscape:window-height="1018"
+ inkscape:window-height="991"
id="namedview64"
showgrid="false"
inkscape:zoom="3.4526316"
- inkscape:cx="84.375"
+ inkscape:cx="84.954268"
inkscape:cy="116.875"
- inkscape:window-x="1680"
- inkscape:window-y="0"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
<g
--- a/model/diff.html Mon Sep 17 11:42:43 2012 -0400
+++ b/model/diff.html Tue Sep 18 10:17:25 2012 +0100
@@ -1,3 +1,4 @@
+
<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>
<html lang="en" dir="ltr">
<head><style type="text/css"><!--
@@ -1026,7 +1027,7 @@
pre.sh_sourceCode .sh_attribute { color: #006400; }
</style><link href="./extra-dm.css" rel="stylesheet" type="text/css" charset="utf-8"><link href="http://www.w3.org/StyleSheets/TR/W3C-ED" rel="stylesheet" type="text/css" charset="utf-8"></head>
- <body style="display: inherit; "><div class="head"><p><a href="http://www.w3.org/"><img width="72" height="48" src="http://www.w3.org/Icons/w3c_home" alt="W3C"></a></p><h1 class="title" id="title">PROV-DM: The PROV Data Model</h1><h2 id="subtitle"><a href="diff.html"><span class="insert">Changes</span></a><span class="insert"> since LC release</span></h2><h2 id="w3c-editor-s-draft-10-september-2012"><acronym title="World Wide Web Consortium">W3C</acronym> <span class="delete">Working</span><span class="insert">Editor's</span> Draft <span class="delete">24 July</span><span class="insert">10 September</span> 2012</h2><dl><dt>This version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120724/</span><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</span></a></dd><dt>Latest published version:</dt><dd><a href="http://www.w3.org/TR/prov-dm/">http://www.w3.org/TR/prov-dm/</a></dd><dt>Latest editor's draft:</dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</a></dd><dt>Previous version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</span><span class="delete"> (</span><span class="delete">color-coded diffs</span><span class="delete">)</span><a href="http://www.w3.org/TR/2012/WD-prov-dm-20120724/"><span class="insert">http://www.w3.org/TR/2012/WD-prov-dm-20120724/</span></a></dd><dt>Editors:</dt><dd><a href="http://www.ecs.soton.ac.uk/~lavm/">Luc Moreau</a>, University of Southampton</dd>
+ <body style="display: inherit; "><div class="head"><p><a href="http://www.w3.org/"><img width="72" height="48" src="http://www.w3.org/Icons/w3c_home" alt="W3C"></a></p><h1 class="title" id="title">PROV-DM: The PROV Data Model</h1><h2 id="subtitle"><a href="diff.html"><span class="insert">Changes</span></a><span class="insert"> since LC release</span></h2><h2 id="w3c-editor-s-draft-18-september-2012"><acronym title="World Wide Web Consortium">W3C</acronym> <span class="delete">Working</span><span class="insert">Editor's</span> Draft <span class="delete">24 July</span><span class="insert">18 September</span> 2012</h2><dl><dt>This version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120724/</span><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</span></a></dd><dt>Latest published version:</dt><dd><a href="http://www.w3.org/TR/prov-dm/">http://www.w3.org/TR/prov-dm/</a></dd><dt>Latest editor's draft:</dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</a></dd><dt>Previous version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</span><span class="delete"> (</span><span class="delete">color-coded diffs</span><span class="delete">)</span><a href="http://www.w3.org/TR/2012/WD-prov-dm-20120724/"><span class="insert">http://www.w3.org/TR/2012/WD-prov-dm-20120724/</span></a></dd><dt>Editors:</dt><dd><a href="http://www.ecs.soton.ac.uk/~lavm/">Luc Moreau</a>, University of Southampton</dd>
<dd><a href="http://www.cs.ncl.ac.uk/people/Paolo.Missier">Paolo Missier</a>, Newcastle University</dd>
<dt><span class="delete">Contributors:</span><span class="insert">Authors:</span></dt><dd><a href="http://semanticweb.org/wiki/Khalid_Belhajjame">Khalid Belhajjame</a>, University of Manchester</dd>
<dd><span>Reza B'Far</span>, Oracle Corporation</dd>
@@ -2521,22 +2522,25 @@
<p>
In this example, the "buy one beer, get one free" offer expired at the end of the happy hour.</p>
<pre class="codeexample">entity(buy_one_beer_get_one_free_offer_during_happy_hour)
-wasAttributedTo(proprietor)
+<span class="delete">wasAttributedTo(proprietor)</span><span class="insert">wasAttributedTo(buy_one_beer_get_one_free_offer_during_happy_hour, proprietor)</span>
wasInvalidatedBy(buy_one_beer_get_one_free_offer_during_happy_hour,
-,2012-03-10T18:00:00)
</pre>
<p>In contrast, in the following descriptions, Bob redeemed the offer 45 minutes before it expired, and got two beers.
</p>
<pre class="codeexample">entity(buy_one_beer_get_one_free_offer_during_happy_hour)
-wasAttributedTo(proprietor)
+<span class="delete">wasAttributedTo(proprietor)</span><span class="insert">wasAttributedTo(buy_one_beer_get_one_free_offer_during_happy_hour, proprietor)</span>
activity(redeemOffer)
entity(twoBeers)
-wasAssociatedWith(redeemOffer,bob)
-used(buy_one_beer_get_one_free_offer_during_happy_hour,
- redeemOffer, 2012-03-10T17:15:00)
+<span class="delete">wasAssociatedWith(redeemOffer,bob)
+used(buy_one_beer_get_one_free_offer_during_happy_hour,</span><span class="insert">wasAssociatedWith(redeemOffer, bob)
+used(redeemOffer,</span>
+ <span class="delete">redeemOffer, </span><span class="insert">buy_one_beer_get_one_free_offer_during_happy_hour,
+ </span>2012-03-10T17:15:00)
wasInvalidatedBy(buy_one_beer_get_one_free_offer_during_happy_hour,
- redeemOffer, 2012-03-10T17:15:00)
+ redeemOffer,
+ 2012-03-10T17:15:00)
wasGeneratedBy(twoBeers,redeemOffer)
</pre>
<p>We see that the offer was both used to be converted into <span class="name">twoBeers</span> and invalidated by the <span class="name">redeemOffer</span> activity: in other words, the combined usage and invalidation indicate consumption of the offer.</p>
@@ -4106,6 +4110,7 @@
</p><ul>
<li> <a href="http://www.w3.org/2011/prov/track/issues/506"><span class="insert">ISSUE-506</span></a><span class="insert">: Updated role from author to contributor, in line with text.
+</span></li><li> <a href="http://www.w3.org/2011/prov/track/issues/492"><span class="insert">ISSUE-492</span></a><span class="insert">: Fixed typos in </span><a href="#anexample-invalidation3" class="anexample-ref"><span><span class="insert">Example 28</span></span></a><span class="insert">.
</span></li></ul>
</div>
--- a/model/prov-dm.html Mon Sep 17 11:42:43 2012 -0400
+++ b/model/prov-dm.html Tue Sep 18 10:17:25 2012 +0100
@@ -2049,7 +2049,7 @@
In this example, the "buy one beer, get one free" offer expired at the end of the happy hour.</p>
<pre class="codeexample">
entity(buy_one_beer_get_one_free_offer_during_happy_hour)
-wasAttributedTo(proprietor)
+wasAttributedTo(buy_one_beer_get_one_free_offer_during_happy_hour, proprietor)
wasInvalidatedBy(buy_one_beer_get_one_free_offer_during_happy_hour,
-,2012-03-10T18:00:00)
</pre>
@@ -2057,15 +2057,17 @@
</p>
<pre class="codeexample">
entity(buy_one_beer_get_one_free_offer_during_happy_hour)
-wasAttributedTo(proprietor)
+wasAttributedTo(buy_one_beer_get_one_free_offer_during_happy_hour, proprietor)
activity(redeemOffer)
entity(twoBeers)
-wasAssociatedWith(redeemOffer,bob)
-used(buy_one_beer_get_one_free_offer_during_happy_hour,
- redeemOffer, 2012-03-10T17:15:00)
+wasAssociatedWith(redeemOffer, bob)
+used(redeemOffer,
+ buy_one_beer_get_one_free_offer_during_happy_hour,
+ 2012-03-10T17:15:00)
wasInvalidatedBy(buy_one_beer_get_one_free_offer_during_happy_hour,
- redeemOffer, 2012-03-10T17:15:00)
+ redeemOffer,
+ 2012-03-10T17:15:00)
wasGeneratedBy(twoBeers,redeemOffer)
</pre>
<p>We see that the offer was both used to be converted into <span class="name">twoBeers</span> and invalidated by the <span class="name">redeemOffer</span> activity: in other words, the combined usage and invalidation indicate consumption of the offer.</p>
@@ -4054,6 +4056,7 @@
<ul>
<li> <a href="http://www.w3.org/2011/prov/track/issues/506">ISSUE-506</a>: Updated role from author to contributor, in line with text.
+<li> <a href="http://www.w3.org/2011/prov/track/issues/492">ISSUE-492</a>: Fixed typos in <a href="#anexample-invalidation3" class="anexample-ref"><span>Example REF</span></a>.
</ul>
</section>