MERGE
authorStian Soiland-Reyes <soiland-reyes@cs.manchester.ac.uk>
Tue, 03 Jul 2012 11:24:52 +0100
changeset 3669 3e05fcc6aaf5
parent 3668 204199d2cfde (current diff)
parent 3665 c4184897445d (diff)
child 3670 894ec0ac1d2f
MERGE
--- a/model/grammar/Makefile	Tue Jul 03 11:23:43 2012 +0100
+++ b/model/grammar/Makefile	Tue Jul 03 11:24:52 2012 +0100
@@ -34,7 +34,7 @@
 
 do.ll.js: ll.provn do.ll.html
 	@echo "grammar_string= " > $(OUT.JS)
-	@cat $(IN.HTML) | sed -e "s/\d039/\\\'/g" | sed -e "s/prod-prov_n_LL/prod/g"  | sed -e "s/term-prov_n_LL/prod/g" | sed -e "s/((/(/g" | sed -e "s/))/)/g"   | sed -e "s/timeZZ/time/g" | sed -e "s/\d035prod-PN_PREFIX/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_LOCAL/g" | sed -e "s/\d035prod-PN_CHARS_U/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_CHARS_U/g"  | sed -e "s/\d035prod-ECHAR/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rECHAR/g"  | sed -e "s/\d035prod-STRING_LITERAL2/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rSTRING_LITERAL2/g" | sed -e "s/\d035prod-STRING_LITERAL_LONG2/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rSTRING_LITERAL_LONG2/g" | sed -e "s/\d035prod-LANGTAG/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rLANGTAG/g" | sed -e "s/\d035prod-IRI_REF/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rIRI_REF/g"  | sed -e "s/\d035prod-PN_CHARS\"/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_CHARS\"/g" > $(IN2.HTML)
+	@cat $(IN.HTML) | sed -e "s/\d039/\\\'/g" | sed -e "s/prod-prov_n_LL/prod/g"  | sed -e "s/term-prov_n_LL/prod/g" | sed -e "s/((/(/g" | sed -e "s/))/)/g"   | sed -e "s/timeZZ/time/g" | sed -e "s/\d035prod-PN_PREFIX/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_LOCAL/g" | sed -e "s/\d035prod-PN_CHARS_U/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_CHARS_U/g"  | sed -e "s/\d035prod-ECHAR/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rECHAR/g"  | sed -e "s/\d035prod-STRING_LITERAL2/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rSTRING_LITERAL2/g" | sed -e "s/\d035prod-STRING_LITERAL_LONG2/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rSTRING_LITERAL_LONG2/g" | sed -e "s/\d035prod-LANGTAG/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rLANGTAG/g" | sed -e "s/\d035prod-IRI_REF/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rIRI_REF/g"  | sed -e "s/\d035prod-PN_CHARS\"/http:\d047\d047www.w3.org\d047TR\d047rdf-sparql-query\d047\d035rPN_CHARS\"/g"  | sed -e "s/\d035prod-DATETIME\"/http:\d047\d047www.w3.org\d047TR\d047xmlschema11-2\d047\d035nt-dateTimeRep\"/g" > $(IN2.HTML)
 	@cat $(IN2.HTML) | awk '{ print "'\''"  $$0 " '\'' + " }' >> $(OUT.JS)
 	@echo "' ' ;" >> $(OUT.JS)
 
--- a/model/grammar/ll.html	Tue Jul 03 11:23:43 2012 +0100
+++ b/model/grammar/ll.html	Tue Jul 03 11:24:52 2012 +0100
@@ -442,7 +442,7 @@
 <td><a id="prod-prov_n_LL-timeZZ" name="prod-prov_n_LL-timeZZ"></a>[<span class="prodNo">49</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">timeZZ</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ISODATETIME">ISODATETIME</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DATETIME">DATETIME</a></span></code></td>
 </tr>
 </tbody>
 
@@ -631,8 +631,8 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-ISODATETIME" name="term-prov_n_LL-ISODATETIME"></a>[<span class="prodNo">69</span>]&nbsp;&nbsp;&nbsp;</td>
-<td>&lt;<code class="production term">ISODATETIME</code>&gt;</td>
+<td><a id="term-prov_n_LL-DATETIME" name="term-prov_n_LL-DATETIME"></a>[<span class="prodNo">69</span>]&nbsp;&nbsp;&nbsp;</td>
+<td>&lt;<code class="production term">DATETIME</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( "." <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)? ))? ))? (( "Z" | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> ))?</code></td>
 </tr>
--- a/model/grammar/ll.js	Tue Jul 03 11:23:43 2012 +0100
+++ b/model/grammar/ll.js	Tue Jul 03 11:24:52 2012 +0100
@@ -443,7 +443,7 @@
 '<td><a id="prod-time" name="prod-time"></a>[<span class="prodNo">49</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="production prod">time</code></td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-ISODATETIME">ISODATETIME</a></span></code></td> ' + 
+'<td><code class="content"><span class="prod"><a class="grammarRef" href="http://www.w3.org/TR/xmlschema11-2/#nt-dateTimeRep">DATETIME</a></span></code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
@@ -632,8 +632,8 @@
 ' ' + 
 '<tbody class="term"> ' + 
 '<tr valign="baseline"> ' + 
-'<td><a id="prod-ISODATETIME" name="prod-ISODATETIME"></a>[<span class="prodNo">69</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td>&lt;<code class="production term">ISODATETIME</code>&gt;</td> ' + 
+'<td><a id="prod-DATETIME" name="prod-DATETIME"></a>[<span class="prodNo">69</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
+'<td>&lt;<code class="production term">DATETIME</code>&gt;</td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ( "." <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> ( <span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-DIGIT">DIGIT</a></span>)? )? )? ( "Z" | <span class="prod"><a class="grammarRef" href="#prod-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> )?</code></td> ' + 
 '</tr> ' + 
--- a/model/grammar/yack/prov-n-LL.bnf	Tue Jul 03 11:23:43 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf	Tue Jul 03 11:24:52 2012 +0100
@@ -150,7 +150,7 @@
 
 
 
-[49] timeZZ::= ISODATETIME
+[49] timeZZ::= DATETIME
 
 
 
@@ -201,7 +201,7 @@
 
 
 DIGIT::=[0-9]
-ISODATETIME::=  DIGIT DIGIT DIGIT DIGIT "-" DIGIT DIGIT "-" DIGIT DIGIT "T" DIGIT DIGIT ":" DIGIT DIGIT ":" DIGIT DIGIT ("." DIGIT (DIGIT DIGIT?)?)? ("Z" | TIMEZONEOFFSET)?
+DATETIME::=  DIGIT DIGIT DIGIT DIGIT "-" DIGIT DIGIT "-" DIGIT DIGIT "T" DIGIT DIGIT ":" DIGIT DIGIT ":" DIGIT DIGIT ("." DIGIT (DIGIT DIGIT?)?)? ("Z" | TIMEZONEOFFSET)?
 
 TIMEZONEOFFSET::= ("+" | "-") DIGIT DIGIT ":" DIGIT DIGIT;
 
--- a/model/grammar/yack/prov-n-LL.bnf.html	Tue Jul 03 11:23:43 2012 +0100
+++ b/model/grammar/yack/prov-n-LL.bnf.html	Tue Jul 03 11:24:52 2012 +0100
@@ -441,7 +441,7 @@
 <td><a id="prod-prov_n_LL-timeZZ" name="prod-prov_n_LL-timeZZ"></a>[<span class="prodNo">49</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">timeZZ</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-ISODATETIME">ISODATETIME</a></span></code></td>
+<td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DATETIME">DATETIME</a></span></code></td>
 </tr>
 </tbody>
 
@@ -630,8 +630,8 @@
 
 <tbody class="term">
 <tr valign="baseline">
-<td><a id="term-prov_n_LL-ISODATETIME" name="term-prov_n_LL-ISODATETIME"></a>[<span class="prodNo">69</span>]&nbsp;&nbsp;&nbsp;</td>
-<td>&lt;<code class="production term">ISODATETIME</code>&gt;</td>
+<td><a id="term-prov_n_LL-DATETIME" name="term-prov_n_LL-DATETIME"></a>[<span class="prodNo">69</span>]&nbsp;&nbsp;&nbsp;</td>
+<td>&lt;<code class="production term">DATETIME</code>&gt;</td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
 <td><code class="content"><span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "-" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> "T" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> ":" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( "." <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (( <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span> (<span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-DIGIT">DIGIT</a></span>)? ))? ))? (( "Z" | <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-TIMEZONEOFFSET">TIMEZONEOFFSET</a></span> ))?</code></td>
 </tr>
--- a/model/prov-n.html	Tue Jul 03 11:23:43 2012 +0100
+++ b/model/prov-n.html	Tue Jul 03 11:24:52 2012 +0100
@@ -341,12 +341,12 @@
 This document is part of the PROV family of specifications, a set of specifications defining various aspects that are necessary to achieve the vision of inter-operable
 interchange of provenance information in heterogeneous environments such as the Web.  The specifications are:
 <ul>
-<li> PROV-DM, the PROV data model for provenance;</li>
-<li> PROV-CONSTRAINTS, a set of constraints applying to the PROV data model;</li>
-<li> PROV-N, a notation for provenance aimed at human consumption  (this document);</li>
-<li> PROV-O, the PROV ontology, an OWL-RL ontology allowing the mapping of PROV to RDF;</li>
-<li> PROV-AQ, the mechanisms for accessing and querying provenance; </li>
-<li> PROV-PRIMER, a primer for the PROV data model;</li>
+<li> <a href="http://www.w3.org/TR/prov-dm/">PROV-DM</a>, the PROV data model for provenance;</li>
+<li> <a href="http://www.w3.org/TR/prov-constraints/">PROV-CONSTRAINTS</a>, a set of constraints applying to the PROV data model;</li>
+<li> <a href="http://www.w3.org/TR/prov-n/">PROV-N</a>, a notation for provenance aimed at human consumption  (this document);</li>
+<li> <a href="http://www.w3.org/TR/prov-o/">PROV-O</a>, the PROV ontology, an OWL2 ontology allowing the mapping of PROV to RDF;</li>
+<li> <a href="http://www.w3.org/TR/prov-aq/">PROV-AQ</a>, the mechanisms for accessing and querying provenance; </li>
+<li> <a href="http://www.w3.org/TR/prov-primer/">PROV-PRIMER</a>, a primer for the PROV data model;</li>
 <li> PROV-SEM, a formal semantics for the PROV data model;</li>
 <li> PROV-XML, an XML schema for the PROV data model.</li>
 </ul>
@@ -2332,9 +2332,6 @@
 
 <table class="grammar">
 <tbody class="grammar-ref" data-ref="prod-time"></tbody>
-<tbody class="grammar-ref" data-ref="prod-DIGIT"></tbody>
-<tbody class="grammar-ref" data-ref="prod-ISODATETIME"></tbody>
-<tbody class="grammar-ref" data-ref="prod-TIMEZONEOFFSET"></tbody>
 </table>
 
 
@@ -2597,8 +2594,9 @@
       <dd>Unicode code points may also be expressed using an \uXXXX (U+0 to U+FFFF) or \UXXXXXXXX syntax (for U+10000 onwards) where X is a hexadecimal digit [0-9A-F]</dd> 
       <dt>Security considerations:</dt> 
       <dd>PROV-N is a general-purpose language for describing the provenance of things; applications may evaluate given data to infer more descriptions or to dereference URIs, invoking the security considerations of the scheme for that URI. Note in particular, the privacy issues in [[!RFC3023]] section 10 for HTTP URIs. Data obtained from an inaccurate or malicious data source may lead to inaccurate or misleading conclusions, as well as the dereferencing of unintended URIs. Care must be taken to align the trust in consulted resources with the sensitivity of the intended use of the data; inferences of potential medical treatments would likely require different trust than inferences for trip planning.</dd> 
-      <dd>PROV-N is used to express arbitrary application data; security considerations will vary by domain of use. Security tools and protocols applicable to text (e.g. PGP encryption, MD5 sum validation, password-protected compression) may also be used on PROV-N documents. Security/privacy protocols must be imposed which reflect the sensitivity of the embedded information.</dd> 
+      <dd>PROV-N is used to express the provenance of arbitrary application data; security considerations will vary by domain of use. Security tools and protocols applicable to text (e.g. PGP encryption, MD5 sum validation, password-protected compression) may also be used on PROV-N documents. Security/privacy protocols must be imposed which reflect the sensitivity of the embedded information.  </dd> 
       <dd>PROV-N can express data which is presented to the user, for example, label attributes. Application rendering strings retrieved from untrusted PROV-N documents must ensure that malignant strings may not be used to mislead the reader. The security considerations in the media type registration for XML ([[!RFC3023]] section 10) provide additional guidance around the expression of arbitrary data and markup.</dd> 
+      <dd>PROV-N is a language for describing the provenance of things, and therefore a PROV-N document is metadata for other resources.  Untrusted PROV-N documents may mislead its consumers by indicating that a third-party resource has a reputable lineage, when it has not. Provenance of PROV-N document should be sought. </dd>
       <dd>PROV-N uses qualified names mappeable to IRIs as term identifiers. Applications interpreting data expressed in PROV-N should address the security issues of
   <a class="norm" href="http://www.ietf.org/rfc/rfc3987.txt">Internationalized Resource Identifiers (IRIs)</a> [[!RFC3987]] Section 8, as well as
   <a class="norm" href="http://www.ietf.org/rfc/rfc3986.txt">Uniform Resource Identifier (URI): Generic Syntax</a> [[!RFC3986]] Section 7.</dd> 
@@ -2619,7 +2617,8 @@
       <dt>Interoperability considerations:</dt> 
       <dd>There are no known interoperability issues.</dd> 
       <dt>Published specification:</dt> 
-      <dd>This specification.</dd> 
+      <dd>PROV-N: The Provenance Notation, Moreau and Missier, eds,
+      <a href="http://www.w3.org/TR/prov-n/">http://www.w3.org/TR/prov-n/</a></dd> 
       <dt>Applications which use this media type:</dt> 
       <dd>No widely deployed applications are known to use this media type. It may be used by some web services and clients consuming their data.</dd> 
       <dt>Additional information:</dt> 
@@ -2628,17 +2627,17 @@
       <dt>File extension(s):</dt> 
       <dd>".pn"</dd> 
       <dt>Base URI:</dt> 
-      <dd>None</dd> 
+      <dd>There are no constructs in the PROV-N Syntax to change the Base IRI.</dd> 
       <dt>Macintosh file type code(s):</dt> 
       <dd>&quot;TEXT&quot;</dd> 
       <dt>Person &amp; email address to contact for further information:</dt> 
-      <dd>Ivan Herman, [email protected]</dd> 
+      <dd>[email protected]</dd> 
       <dt>Intended usage:</dt> 
       <dd>COMMON</dd> 
       <dt>Restrictions on usage:</dt> 
       <dd>None</dd> 
       <dt>Author/Change controller:</dt> 
-      <dd>The PROV-N specification is the product of Luc Moreau and Paolo Missier. A W3C Working Group may assume maintenance of this document; W3C reserves change control over this specifications.</dd> 
+      <dd>The PROV-N specification is the product of the World Wide Web Consortium's PROV Working Group. The W3C has change control over this specification.</dd> 
     </dl> 
  
 </section>