--- a/model/extra-dm.css Tue May 29 17:10:56 2012 -0400
+++ b/model/extra-dm.css Tue May 29 23:08:33 2012 +0100
@@ -4,11 +4,11 @@
background-color: rgba(255,42,42,0.2);
}
-.component2-color {
+.component3-color {
background-color: rgba(0,68,170,0.2);
}
-.component3-color {
+.component2-color {
background-color: rgba(0,170,0,0.2);
}
.component4-color {
Binary file model/images/components-dependencies.png has changed
--- a/model/images/components-dependencies.svg Tue May 29 17:10:56 2012 -0400
+++ b/model/images/components-dependencies.svg Tue May 29 23:08:33 2012 +0100
@@ -94,13 +94,13 @@
inkscape:pageshadow="2"
inkscape:zoom="1.6927759"
inkscape:cx="162.4172"
- inkscape:cy="838.88801"
+ inkscape:cy="837.70652"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1280"
- inkscape:window-height="1003"
- inkscape:window-x="0"
+ inkscape:window-height="978"
+ inkscape:window-x="1280"
inkscape:window-y="0"
inkscape:window-maximized="1" />
<metadata
@@ -183,7 +183,7 @@
y="372.32501"
x="144.82066"
id="tspan2830-8-0"
- sodipodi:role="line">C1: entities/activities</tspan></text>
+ sodipodi:role="line">C1: Entities/Activities</tspan></text>
<text
inkscape:export-ydpi="111.90985"
inkscape:export-xdpi="111.90985"
@@ -202,7 +202,7 @@
id="tspan3680-0-7"
y="-267.83533"
x="244.55112"
- sodipodi:role="line"> alternate</tspan></text>
+ sodipodi:role="line"> Alternate</tspan></text>
<text
inkscape:export-ydpi="111.90985"
inkscape:export-xdpi="111.90985"
@@ -220,7 +220,7 @@
id="tspan5140-0"
y="220.41071"
x="283.85522"
- sodipodi:role="line">bundles</tspan></text>
+ sodipodi:role="line">Bundles</tspan></text>
<text
inkscape:export-ydpi="111.90985"
inkscape:export-xdpi="111.90985"
@@ -238,7 +238,7 @@
id="tspan3688-4-4"
y="218.63846"
x="159.93692"
- sodipodi:role="line">collections</tspan></text>
+ sodipodi:role="line">Collections</tspan></text>
<a
transform="translate(-12.061437,-465.00725)"
id="a5287"
@@ -261,11 +261,11 @@
sodipodi:role="line"
id="tspan3668-6-1"
x="168.54915"
- y="741.90149">C3: </tspan><tspan
+ y="741.90149">C2: </tspan><tspan
sodipodi:role="line"
x="168.54915"
y="761.90149"
- id="tspan3215">derivations</tspan></text>
+ id="tspan3215">Derivations</tspan></text>
</a>
<a
transform="translate(26.371671,-423.40667)"
@@ -290,11 +290,11 @@
sodipodi:role="line"
id="tspan2830-6-0-1"
x="666.76715"
- y="-52.821533">C2: agents/</tspan><tspan
+ y="-52.821533">C3: Agents/</tspan><tspan
sodipodi:role="line"
x="666.76715"
y="-32.821533"
- id="tspan3638-1-1">responsibility</tspan></text>
+ id="tspan3638-1-1">Responsibility</tspan></text>
</a>
</g>
</svg>
--- a/model/prov-dm.html Tue May 29 17:10:56 2012 -0400
+++ b/model/prov-dm.html Tue May 29 23:08:33 2012 +0100
@@ -1341,11 +1341,11 @@
<caption id="relations-at-a-glance">Table 4: PROV-DM Relations At a Glance</caption>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td colspan="3">Object</td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td>Entity</td><td>Activity</td><td>Agent</td></tr>
-<tr><td rowspan="3">Subject</td><td>Entity</td><td><div class="component3-color"><a class="essential">WasDerivedFrom</a><br><a>WasRevisionOf</a><br><a>WasQuotedFrom</a><br><a>HadOriginalSource</a></div><div class="component4-color"><a>AlternateOf</a><br><a>SpecializationOf</a></div></td><td class="component1-color"><a class="essential"
+<tr><td rowspan="3">Subject</td><td>Entity</td><td><div class="component2-color"><a class="essential">WasDerivedFrom</a><br><a>WasRevisionOf</a><br><a>WasQuotedFrom</a><br><a>HadOriginalSource</a></div><div class="component4-color"><a>AlternateOf</a><br><a>SpecializationOf</a></div></td><td class="component1-color"><a class="essential"
title="wasGeneratedBy">WasGeneratedBy</a><br><a
-title="wasInvalidatedBy">WasInvalidatedBy</a></td><td class="component2-color"><a class="essential">WasAttributedTo</a></td></tr>
-<tr><td>Activity</td><td><div class="component1-color"><a class="essential">Used</a><br><a>WasStartedBy</a><br><a>WasEndedBy</a></div></td><td class="component1-color"><a class="essential">WasInformedBy</a></td><td class="component2-color"><a class="essential">WasAssociatedWith</a></td></tr>
-<tr><td>Agent</td><td>—</td><td>—</td><td class="component2-color"><a class="essential">ActedOnBehalfOf</a></td></tr>
+title="wasInvalidatedBy">WasInvalidatedBy</a></td><td class="component3-color"><a class="essential">WasAttributedTo</a></td></tr>
+<tr><td>Activity</td><td><div class="component1-color"><a class="essential">Used</a><br><a>WasStartedBy</a><br><a>WasEndedBy</a></div></td><td class="component1-color"><a class="essential">WasInformedBy</a></td><td class="component3-color"><a class="essential">WasAssociatedWith</a></td></tr>
+<tr><td>Agent</td><td>—</td><td>—</td><td class="component3-color"><a class="essential">ActedOnBehalfOf</a></td></tr>
</table>
</div>
@@ -1358,7 +1358,7 @@
<tr><td><a><b>Type or Relation Name</b></a></td><td><b>Representation in the PROV-N notation</b></td><td><b>Component</b></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr class="component1-color"><td class="essential"><a>Entity</a></td><td><a title="dfn-Entity" class="essential">entity(id, [ attr1=val1, ...])</a></td><td rowspan="8"><a href="#component1">Component 1: entities/activities</a></td></tr>
+<tr class="component1-color"><td class="essential"><a>Entity</a></td><td><a title="dfn-Entity" class="essential">entity(id, [ attr1=val1, ...])</a></td><td rowspan="8"><a href="#component1">Component 1: Entities/Activities</a></td></tr>
<tr class="component1-color"><td class="essential"><a>Activity</a></td><td><a title="dfn-Activity" class="essential">activity(id, st, et, [ attr1=val1, ...])</a></td></tr>
<tr class="component1-color"><td class="essential"><a>Generation</a></td><td><a title="wasGeneratedBy"><span class="essential">wasGeneratedBy(</span>id;<span class="essential">e,a</span>,t,attrs<span class="essential">)</span></a></td></tr>
<tr class="component1-color"><td class="essential"><a>Usage</a></td><td><a title="used"><span class="essential">used(</span>id;<span class="essential">a,e</span>,t,attrs<span class="essential">)</span></a></td></tr>
@@ -1369,14 +1369,14 @@
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr class="component2-color"><td class="essential"><a>Derivation</a></td><td><a title="wasDerivedFrom"><span class="essential">wasDerivedFrom(</span>id; <span class="essential">e2, e1</span>, a, g2, u1, attrs<span class="essential">)</span></a></td><td rowspan="5"><a href="#component2">Component 2: derivation</a></td></tr>
+<tr class="component2-color"><td class="essential"><a>Derivation</a></td><td><a title="wasDerivedFrom"><span class="essential">wasDerivedFrom(</span>id; <span class="essential">e2, e1</span>, a, g2, u1, attrs<span class="essential">)</span></a></td><td rowspan="5"><a href="#component2">Component 2: Derivations</a></td></tr>
<tr class="component2-color"><td class="provType"><a>Revision</a></td><td><a title="revision">... prov:type='prov:WasRevisionOf' ...</a></td></tr>
<tr class="component2-color"><td class="provType"><a>Quotation</a></td><td><a title="quotation">... prov:type='prov:WasQuotedFrom' ...</a></td></tr>
<tr class="component2-color"><td class="provType"><a>Original Source</a></td><td><a title="Original Source">... prov:type='prov:HadOriginalSource' ...</a></td></tr>
<tr class="component2-color"><td><a>Trace</a></td><td><a title="tracedTo">tracedTo(id;e2,e1,attrs)</a></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr class="component3-color" style="border-collapse: collapse; "><td class="essential"><a>Agent</a></td><td><a title="dfn-agent" class="essential">agent(id, [ attr1=val1, ...])</a></td><td rowspan="8"><a href="#component3">Component 3: agents/responsibility</a></td></tr>
+<tr class="component3-color" style="border-collapse: collapse; "><td class="essential"><a>Agent</a></td><td><a title="dfn-agent" class="essential">agent(id, [ attr1=val1, ...])</a></td><td rowspan="8"><a href="#component3">Component 3: Agents/Responsibility</a></td></tr>
<tr class="component3-color"><td class="essential"><a>Attribution</a></td><td><a title="wasAttributedTo"><span class="essential">wasAttributedTo(</span>id;<span class="essential">e,ag</span>,attr<span class="essential">)</span></a></td></tr>
<tr class="component3-color"><td class="essential"><a>Association</a></td><td><a title="wasAssociatedWith"><span class="essential">wasAssociatedWith(</span>id;<span class="essential">a,ag</span>,pl,attrs<span class="essential">)</span></a></td></tr>
<tr class="component3-color"><td class="essential"><a>Delegation</a></td><td><a title="actedOnBehalfOf"><span class="essential">actedOnBehalfOf(</span>id;<span class="essential">ag2,ag1</span>,a,attrs<span class="essential">)</span></a></td></tr>
@@ -1387,11 +1387,11 @@
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr class="component4-color"><td><a>Alternate</a></td><td><a title="alternateOf">alternateOf(alt1, alt2)</a></td><td rowspan="2"><a href="#component4">Component 4: alternate</a></td></tr>
+<tr class="component4-color"><td><a>Alternate</a></td><td><a title="alternateOf">alternateOf(alt1, alt2)</a></td><td rowspan="2"><a href="#component4">Component 4: Alternate</a></td></tr>
<tr class="component4-color"><td><a>Specialization</a></td><td><a title="specializationOf">specializationOf(sub, super)</a></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
-<tr class="component5-color"><td><a title="bundle">Bundle constructor</a></td><td><a title="dfn-bundle">bundle id description_1 ... description_n endBundle</a></td><td rowspan="3"><a href="#component5">Component 5: bundles</a></td></tr>
+<tr class="component5-color"><td><a title="bundle">Bundle constructor</a></td><td><a title="dfn-bundle">bundle id description_1 ... description_n endBundle</a></td><td rowspan="3"><a href="#component5">Component 5: Bundles</a></td></tr>
<tr class="component5-color"><td class="provType"><a title="bundle">Bundle description</a></td><td><a>... prov:type='prov:Bundle' ...</a></td></tr>
<tr class="component5-color"><td><a>Provenance Locator</a></td><td><a title="hasProvenanceIn">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</a></td></tr>
<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>