Merge changes.
--- a/2/ODRL20.html Mon May 12 10:45:51 2014 +0100
+++ b/2/ODRL20.html Mon May 12 10:48:31 2014 +0100
@@ -15,6 +15,7 @@
<em>The Open Digital Rights Language (ODRL) provides flexible and interoperable mechanisms to support transparent and innovative use of digital content in publishing, distribution, and consumption of of digital media across all sectors and communities. The ODRL Policy model is broad enough to support traditional rights expressions for commercial transaction, open access expressions for publicly distributed content, and privacy expressions for social media.</em>
<dl>
<dt>Latest Version</dt><dd><a href="http://www.w3.org/ns/odrl/2/">http://www.w3.org/ns/odrl/2/</a></dd>
+<dt>Date</dt><dd>2014-05-12</dd>
<dt>Revision</dt><dd>2.0</dd>
<dt>Authors</dt><dd>Mo McRoberts (BBC), Víctor Rodríguez Doncel (OEG-UPM)</dd>
<dt>Contributors</dt><dd>ODRL Community Group</dd>
@@ -339,7 +340,7 @@
<p>Additionally, the assigner (the party who the personal data is about) has stipulated that the assignee must delete the asset after a <code>30 day period</code> (retention policy).</p>
<pre><code>@prefix odrl: <http://w3.org/ns/odrl/2/> .
-@prefix p3p: <http://www.w3.org/2006/01/P3Pv11> .
+@prefix p3p: <http://www.w3.org/2002/01/p3prdfv1#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
<http://example.com/policy:1111>
--- a/2/ODRL20.nt Mon May 12 10:45:51 2014 +0100
+++ b/2/ODRL20.nt Mon May 12 10:48:31 2014 +0100
@@ -7,6 +7,7 @@
<http://www.w3.org/ns/odrl/2/> <http://purl.org/vocab/vann/example> <http://www.w3.org/ns/odrl/2/Asset> .
<http://www.w3.org/ns/odrl/2/> <http://purl.org/dc/terms/creator> "Mo McRoberts (BBC)" .
<http://www.w3.org/ns/odrl/2/> <http://purl.org/dc/terms/creator> "V\u00EDctor Rodr\u00EDguez Doncel (OEG-UPM)" .
+<http://www.w3.org/ns/odrl/2/> <http://purl.org/dc/terms/published> "2014-05-12"^^<http://www.w3.org/2001/XMLSchema#date> .
<http://www.w3.org/ns/odrl/2/> <http://purl.org/dc/terms/contributor> "ODRL Community Group" .
<http://www.w3.org/ns/odrl/2/> <http://purl.org/dc/terms/description> "The Open Digital Rights Language (ODRL) provides flexible and interoperable mechanisms to support transparent and innovative use of digital content in publishing, distribution, and consumption of of digital media across all sectors and communities. The ODRL Policy model is broad enough to support traditional rights expressions for commercial transaction, open access expressions for publicly distributed content, and privacy expressions for social media."@en .
<http://www.w3.org/ns/odrl/2/odrl.ttl> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://purl.org/dc/dcmitype/Text> .
@@ -216,6 +217,8 @@
<http://www.w3.org/ns/odrl/2/Permission> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> .
<http://www.w3.org/ns/odrl/2/Permission> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
<http://www.w3.org/ns/odrl/2/Permission> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/ns/odrl/2/Rule> .
+<http://www.w3.org/ns/odrl/2/Permission> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Prohibition> .
+<http://www.w3.org/ns/odrl/2/Permission> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Duty> .
<http://www.w3.org/ns/odrl/2/Permission> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
<http://www.w3.org/ns/odrl/2/Permission> <http://www.w3.org/2000/01/rdf-schema#label> "Permission"@en .
<http://www.w3.org/ns/odrl/2/Permission> <http://www.w3.org/2000/01/rdf-schema#comment> "A Permission is a rule which indicates the actions the assignee is permitted to perform on the associated asset. In other words, what the assigner (supplier) has granted to the assignee (consumer)."@en .
@@ -223,6 +226,8 @@
<http://www.w3.org/ns/odrl/2/Prohibition> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> .
<http://www.w3.org/ns/odrl/2/Prohibition> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
<http://www.w3.org/ns/odrl/2/Prohibition> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/ns/odrl/2/Rule> .
+<http://www.w3.org/ns/odrl/2/Prohibition> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Duty> .
+<http://www.w3.org/ns/odrl/2/Prohibition> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Permission> .
<http://www.w3.org/ns/odrl/2/Prohibition> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
<http://www.w3.org/ns/odrl/2/Prohibition> <http://www.w3.org/2000/01/rdf-schema#label> "Prohibition"@en .
<http://www.w3.org/ns/odrl/2/Prohibition> <http://www.w3.org/2000/01/rdf-schema#comment> "A Prohibition is a rule which indicates the Actions that the assignee is prohibited to perform on the related Asset."@en .
@@ -230,6 +235,8 @@
<http://www.w3.org/ns/odrl/2/Duty> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2002/07/owl#Class> .
<http://www.w3.org/ns/odrl/2/Duty> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
<http://www.w3.org/ns/odrl/2/Duty> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/ns/odrl/2/Rule> .
+<http://www.w3.org/ns/odrl/2/Duty> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Prohibition> .
+<http://www.w3.org/ns/odrl/2/Duty> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Permission> .
<http://www.w3.org/ns/odrl/2/Duty> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
<http://www.w3.org/ns/odrl/2/Duty> <http://www.w3.org/2000/01/rdf-schema#label> "Duty"@en .
<http://www.w3.org/ns/odrl/2/Duty> <http://www.w3.org/2000/01/rdf-schema#comment> "A Duty is a rule which indicates requirements which must be fulfilled in order to receive the permission."@en .
@@ -936,6 +943,11 @@
<http://www.w3.org/ns/odrl/2/Agreement> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
<http://www.w3.org/ns/odrl/2/Agreement> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
<http://www.w3.org/ns/odrl/2/Agreement> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/ns/odrl/2/Policy> .
+<http://www.w3.org/ns/odrl/2/Agreement> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Offer> .
+<http://www.w3.org/ns/odrl/2/Agreement> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Privacy> .
+<http://www.w3.org/ns/odrl/2/Agreement> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Request> .
+<http://www.w3.org/ns/odrl/2/Agreement> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Set> .
+<http://www.w3.org/ns/odrl/2/Agreement> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Ticket> .
<http://www.w3.org/ns/odrl/2/Agreement> <http://www.w3.org/2000/01/rdf-schema#label> "Agreement"@en .
<http://www.w3.org/ns/odrl/2/Agreement> <http://www.w3.org/2000/01/rdf-schema#comment> "Policy expressions that are formal contracts (or licenses) stipulating all the terms of usage and all the parties involved."@en .
<http://www.w3.org/ns/odrl/2/Offer> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
@@ -943,6 +955,11 @@
<http://www.w3.org/ns/odrl/2/Offer> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
<http://www.w3.org/ns/odrl/2/Offer> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
<http://www.w3.org/ns/odrl/2/Offer> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/ns/odrl/2/Policy> .
+<http://www.w3.org/ns/odrl/2/Offer> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Agreement> .
+<http://www.w3.org/ns/odrl/2/Offer> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Privacy> .
+<http://www.w3.org/ns/odrl/2/Offer> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Request> .
+<http://www.w3.org/ns/odrl/2/Offer> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Set> .
+<http://www.w3.org/ns/odrl/2/Offer> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Ticket> .
<http://www.w3.org/ns/odrl/2/Offer> <http://www.w3.org/2000/01/rdf-schema#label> "Offer"@en .
<http://www.w3.org/ns/odrl/2/Offer> <http://www.w3.org/2000/01/rdf-schema#comment> "An instance of Offer is a Policy expression that proposes terms of usage from an Asset owner."@en .
<http://www.w3.org/ns/odrl/2/Privacy> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
@@ -950,6 +967,11 @@
<http://www.w3.org/ns/odrl/2/Privacy> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
<http://www.w3.org/ns/odrl/2/Privacy> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
<http://www.w3.org/ns/odrl/2/Privacy> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/ns/odrl/2/Policy> .
+<http://www.w3.org/ns/odrl/2/Privacy> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Agreement> .
+<http://www.w3.org/ns/odrl/2/Privacy> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Offer> .
+<http://www.w3.org/ns/odrl/2/Privacy> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Request> .
+<http://www.w3.org/ns/odrl/2/Privacy> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Set> .
+<http://www.w3.org/ns/odrl/2/Privacy> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Ticket> .
<http://www.w3.org/ns/odrl/2/Privacy> <http://www.w3.org/2000/01/rdf-schema#label> "Privacy"@en .
<http://www.w3.org/ns/odrl/2/Privacy> <http://www.w3.org/2000/01/rdf-schema#comment> "An instance of Privacy is a Policy expression that stipulates the terms of usage over personal information."@en .
<http://www.w3.org/ns/odrl/2/Request> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
@@ -957,6 +979,11 @@
<http://www.w3.org/ns/odrl/2/Request> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
<http://www.w3.org/ns/odrl/2/Request> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
<http://www.w3.org/ns/odrl/2/Request> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/ns/odrl/2/Policy> .
+<http://www.w3.org/ns/odrl/2/Request> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Agreement> .
+<http://www.w3.org/ns/odrl/2/Request> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Offer> .
+<http://www.w3.org/ns/odrl/2/Request> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Privacy> .
+<http://www.w3.org/ns/odrl/2/Request> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Set> .
+<http://www.w3.org/ns/odrl/2/Request> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Ticket> .
<http://www.w3.org/ns/odrl/2/Request> <http://www.w3.org/2000/01/rdf-schema#label> "Request"@en .
<http://www.w3.org/ns/odrl/2/Request> <http://www.w3.org/2000/01/rdf-schema#comment> "An instance of Request is a Policy expression that proposes terms of usage to an Asset owner."@en .
<http://www.w3.org/ns/odrl/2/Set> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
@@ -964,6 +991,11 @@
<http://www.w3.org/ns/odrl/2/Set> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
<http://www.w3.org/ns/odrl/2/Set> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
<http://www.w3.org/ns/odrl/2/Set> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/ns/odrl/2/Policy> .
+<http://www.w3.org/ns/odrl/2/Set> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Agreement> .
+<http://www.w3.org/ns/odrl/2/Set> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Offer> .
+<http://www.w3.org/ns/odrl/2/Set> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Privacy> .
+<http://www.w3.org/ns/odrl/2/Set> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Request> .
+<http://www.w3.org/ns/odrl/2/Set> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Ticket> .
<http://www.w3.org/ns/odrl/2/Set> <http://www.w3.org/2000/01/rdf-schema#label> "Set"@en .
<http://www.w3.org/ns/odrl/2/Set> <http://www.w3.org/2000/01/rdf-schema#comment> "An instance of Set is a Policy expression that consists of entities from the complete model."@en .
<http://www.w3.org/ns/odrl/2/Ticket> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
@@ -971,6 +1003,11 @@
<http://www.w3.org/ns/odrl/2/Ticket> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
<http://www.w3.org/ns/odrl/2/Ticket> <http://www.w3.org/2003/06/sw-vocab-status/ns#term_status> "testing" .
<http://www.w3.org/ns/odrl/2/Ticket> <http://www.w3.org/2000/01/rdf-schema#subClassOf> <http://www.w3.org/ns/odrl/2/Policy> .
+<http://www.w3.org/ns/odrl/2/Ticket> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Agreement> .
+<http://www.w3.org/ns/odrl/2/Ticket> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Offer> .
+<http://www.w3.org/ns/odrl/2/Ticket> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Privacy> .
+<http://www.w3.org/ns/odrl/2/Ticket> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Request> .
+<http://www.w3.org/ns/odrl/2/Ticket> <http://www.w3.org/2002/07/owl#disjointWith> <http://www.w3.org/ns/odrl/2/Set> .
<http://www.w3.org/ns/odrl/2/Ticket> <http://www.w3.org/2000/01/rdf-schema#label> "Ticket"@en .
<http://www.w3.org/ns/odrl/2/Ticket> <http://www.w3.org/2000/01/rdf-schema#comment> "An instance of Ticket is a Policy expression that stipulates the terms of usage and is redeemable by any Party who currently holds the Ticket in their possession."@en .
<http://www.w3.org/ns/odrl/2/All> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2000/01/rdf-schema#Class> .
--- a/2/ODRL20.rdf Mon May 12 10:45:51 2014 +0100
+++ b/2/ODRL20.rdf Mon May 12 10:48:31 2014 +0100
@@ -18,6 +18,7 @@
<dct:creator>Mo McRoberts (BBC)</dct:creator>
<dct:creator>Víctor Rodríguez Doncel (OEG-UPM)</dct:creator>
<dct:description xml:lang="en">The Open Digital Rights Language (ODRL) provides flexible and interoperable mechanisms to support transparent and innovative use of digital content in publishing, distribution, and consumption of of digital media across all sectors and communities. The ODRL Policy model is broad enough to support traditional rights expressions for commercial transaction, open access expressions for publicly distributed content, and privacy expressions for social media.</dct:description>
+ <dct:published rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2014-05-12</dct:published>
<vann:example rdf:resource="http://www.w3.org/ns/odrl/2/Asset"/>
<vann:preferredNamespacePrefix>odrl</vann:preferredNamespacePrefix>
<vann:preferredNamespaceUri rdf:resource="http://w3.org/ns/odrl/2/"/>
@@ -39,6 +40,11 @@
<rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
<rdfs:label xml:lang="en">Agreement</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.w3.org/ns/odrl/2/Policy"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Offer"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Privacy"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Request"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Set"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Ticket"/>
<vs:term_status>testing</vs:term_status>
</rdfs:Class>
<rdfs:Class rdf:about="http://www.w3.org/ns/odrl/2/All">
@@ -102,6 +108,8 @@
<rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
<rdfs:label xml:lang="en">Duty</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.w3.org/ns/odrl/2/Rule"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Permission"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Prohibition"/>
<vs:term_status>testing</vs:term_status>
</rdfs:Class>
<rdfs:Class rdf:about="http://www.w3.org/ns/odrl/2/Group">
@@ -126,6 +134,11 @@
<rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
<rdfs:label xml:lang="en">Offer</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.w3.org/ns/odrl/2/Policy"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Agreement"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Privacy"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Request"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Set"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Ticket"/>
<vs:term_status>testing</vs:term_status>
</rdfs:Class>
<rdfs:Class rdf:about="http://www.w3.org/ns/odrl/2/Operator">
@@ -149,6 +162,8 @@
<rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
<rdfs:label xml:lang="en">Permission</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.w3.org/ns/odrl/2/Rule"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Duty"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Prohibition"/>
<vs:term_status>testing</vs:term_status>
</rdfs:Class>
<rdfs:Class rdf:about="http://www.w3.org/ns/odrl/2/Policy">
@@ -165,6 +180,11 @@
<rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
<rdfs:label xml:lang="en">Privacy</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.w3.org/ns/odrl/2/Policy"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Agreement"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Offer"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Request"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Set"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Ticket"/>
<vs:term_status>testing</vs:term_status>
</rdfs:Class>
<rdfs:Class rdf:about="http://www.w3.org/ns/odrl/2/Prohibition">
@@ -173,6 +193,8 @@
<rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
<rdfs:label xml:lang="en">Prohibition</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.w3.org/ns/odrl/2/Rule"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Duty"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Permission"/>
<vs:term_status>testing</vs:term_status>
</rdfs:Class>
<rdfs:Class rdf:about="http://www.w3.org/ns/odrl/2/Request">
@@ -181,6 +203,11 @@
<rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
<rdfs:label xml:lang="en">Request</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.w3.org/ns/odrl/2/Policy"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Agreement"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Offer"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Privacy"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Set"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Ticket"/>
<vs:term_status>testing</vs:term_status>
</rdfs:Class>
<rdfs:Class rdf:about="http://www.w3.org/ns/odrl/2/Rule">
@@ -196,6 +223,11 @@
<rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
<rdfs:label xml:lang="en">Set</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.w3.org/ns/odrl/2/Policy"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Agreement"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Offer"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Privacy"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Request"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Ticket"/>
<vs:term_status>testing</vs:term_status>
</rdfs:Class>
<rdfs:Class rdf:about="http://www.w3.org/ns/odrl/2/Ticket">
@@ -204,6 +236,11 @@
<rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
<rdfs:label xml:lang="en">Ticket</rdfs:label>
<rdfs:subClassOf rdf:resource="http://www.w3.org/ns/odrl/2/Policy"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Agreement"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Offer"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Privacy"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Request"/>
+ <owl:disjointWith rdf:resource="http://www.w3.org/ns/odrl/2/Set"/>
<vs:term_status>testing</vs:term_status>
</rdfs:Class>
<rdfs:Class rdf:about="http://www.w3.org/ns/odrl/2/UndefinedTerm">
--- a/2/ODRL20.ttl Mon May 12 10:45:51 2014 +0100
+++ b/2/ODRL20.ttl Mon May 12 10:48:31 2014 +0100
@@ -22,6 +22,7 @@
vann:preferredNamespacePrefix "odrl" ;
vann:example :Asset ;
dct:creator "Mo McRoberts (BBC)", "Víctor Rodríguez Doncel (OEG-UPM)" ;
+ dct:published "2014-05-12"^^xsd:date ;
dct:contributor "ODRL Community Group" ;
dct:description "The Open Digital Rights Language (ODRL) provides flexible and interoperable mechanisms to support transparent and innovative use of digital content in publishing, distribution, and consumption of of digital media across all sectors and communities. The ODRL Policy model is broad enough to support traditional rights expressions for commercial transaction, open access expressions for publicly distributed content, and privacy expressions for social media."@en .
@@ -219,6 +220,7 @@
a rdfs:Class , owl:Class ;
rdfs:isDefinedBy odrl: ;
rdfs:subClassOf :Rule ;
+ owl:disjointWith :Prohibition, :Duty ;
vs:term_status "testing" ;
rdfs:label "Permission"@en ;
rdfs:comment "A Permission is a rule which indicates the actions the assignee is permitted to perform on the associated asset. In other words, what the assigner (supplier) has granted to the assignee (consumer)."@en .
@@ -227,6 +229,7 @@
a rdfs:Class , owl:Class ;
rdfs:isDefinedBy odrl: ;
rdfs:subClassOf :Rule ;
+ owl:disjointWith :Duty, :Permission ;
vs:term_status "testing" ;
rdfs:label "Prohibition"@en ;
rdfs:comment "A Prohibition is a rule which indicates the Actions that the assignee is prohibited to perform on the related Asset."@en .
@@ -235,6 +238,7 @@
a rdfs:Class , owl:Class ;
rdfs:isDefinedBy odrl: ;
rdfs:subClassOf :Rule ;
+ owl:disjointWith :Prohibition, :Permission ;
vs:term_status "testing" ;
rdfs:label "Duty"@en ;
rdfs:comment "A Duty is a rule which indicates requirements which must be fulfilled in order to receive the permission."@en .
@@ -1058,6 +1062,7 @@
rdfs:isDefinedBy odrl: ;
vs:term_status "testing" ;
rdfs:subClassOf :Policy ;
+ owl:disjointWith :Offer, :Privacy, :Request, :Set, :Ticket ;
rdfs:label "Agreement"@en ;
rdfs:comment "Policy expressions that are formal contracts (or licenses) stipulating all the terms of usage and all the parties involved."@en .
@@ -1066,6 +1071,7 @@
rdfs:isDefinedBy odrl: ;
vs:term_status "testing" ;
rdfs:subClassOf :Policy ;
+ owl:disjointWith :Agreement, :Privacy, :Request, :Set, :Ticket ;
rdfs:label "Offer"@en ;
rdfs:comment "An instance of Offer is a Policy expression that proposes terms of usage from an Asset owner."@en .
@@ -1074,6 +1080,7 @@
rdfs:isDefinedBy odrl: ;
vs:term_status "testing" ;
rdfs:subClassOf :Policy ;
+ owl:disjointWith :Agreement, :Offer, :Request, :Set, :Ticket ;
rdfs:label "Privacy"@en ;
rdfs:comment "An instance of Privacy is a Policy expression that stipulates the terms of usage over personal information."@en .
@@ -1082,6 +1089,7 @@
rdfs:isDefinedBy odrl: ;
vs:term_status "testing" ;
rdfs:subClassOf :Policy ;
+ owl:disjointWith :Agreement, :Offer, :Privacy, :Set, :Ticket ;
rdfs:label "Request"@en ;
rdfs:comment "An instance of Request is a Policy expression that proposes terms of usage to an Asset owner."@en .
@@ -1090,6 +1098,7 @@
rdfs:isDefinedBy odrl: ;
vs:term_status "testing" ;
rdfs:subClassOf :Policy ;
+ owl:disjointWith :Agreement, :Offer, :Privacy, :Request, :Ticket ;
rdfs:label "Set"@en ;
rdfs:comment "An instance of Set is a Policy expression that consists of entities from the complete model."@en .
@@ -1098,6 +1107,7 @@
rdfs:isDefinedBy odrl: ;
vs:term_status "testing" ;
rdfs:subClassOf :Policy ;
+ owl:disjointWith :Agreement, :Offer, :Privacy, :Request, :Set ;
rdfs:label "Ticket"@en ;
rdfs:comment "An instance of Ticket is a Policy expression that stipulates the terms of usage and is redeemable by any Party who currently holds the Ticket in their possession."@en .
--- a/classes.php Mon May 12 10:45:51 2014 +0100
+++ b/classes.php Mon May 12 10:48:31 2014 +0100
@@ -154,7 +154,7 @@
$html .= "<dl>\n";
$html .= "<dt>Latest Version</dt><dd>".$this->htmlLink()."</dd>\n";
$html .= $this->propertyDefinition('Created', 'dc:created|dc11:created');
- $html .= $this->propertyDefinition('Date', 'dc:date|dc11:date');
+ $html .= $this->propertyDefinition('Date', 'dc:date|dc11:date|dc:published|dc11:published');
$html .= $this->propertyDefinition('Revision', 'owl:versionInfo');
$html .= $this->propertyDefinition('Authors', 'foaf:maker|dc:creator|dc11:creator');
$html .= $this->propertyDefinition('Contributors', 'dc:contributor|dc11:contributor');
--- a/examples/example7.nt Mon May 12 10:45:51 2014 +0100
+++ b/examples/example7.nt Mon May 12 10:48:31 2014 +0100
@@ -6,7 +6,7 @@
_:genid2 <http://w3.org/ns/odrl/2/constraint> _:genid1 .
_:genid3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://w3.org/ns/odrl/2/Constraint> .
_:genid3 <http://w3.org/ns/odrl/2/operator> <http://w3.org/ns/odrl/2/eq> .
-_:genid3 <http://w3.org/ns/odrl/2/purpose> <http://www.w3.org/2006/01/P3Pv11contact> .
+_:genid3 <http://w3.org/ns/odrl/2/purpose> <http://www.w3.org/2002/01/p3prdfv1#contact> .
_:genid4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://w3.org/ns/odrl/2/Permission> .
_:genid4 <http://w3.org/ns/odrl/2/action> <http://w3.org/ns/odrl/2/distribute> .
_:genid4 <http://w3.org/ns/odrl/2/target> <http://example.com/billie:888:personal-data> .
--- a/examples/example7.rdf Mon May 12 10:45:51 2014 +0100
+++ b/examples/example7.rdf Mon May 12 10:48:31 2014 +0100
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<rdf:RDF
xmlns:odrl="http://w3.org/ns/odrl/2/"
- xmlns:p3p="http://www.w3.org/2006/01/P3Pv11"
+ xmlns:p3p="http://www.w3.org/2002/01/p3prdfv1#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:xsd="http://www.w3.org/2001/XMLSchema#">
<odrl:Party rdf:about="http://example.com/billie:888"/>
@@ -15,7 +15,7 @@
<odrl:constraint>
<odrl:Constraint>
<odrl:operator rdf:resource="http://w3.org/ns/odrl/2/eq"/>
- <odrl:purpose rdf:resource="http://www.w3.org/2006/01/P3Pv11contact"/>
+ <odrl:purpose rdf:resource="http://www.w3.org/2002/01/p3prdfv1#contact"/>
</odrl:Constraint>
</odrl:constraint>
<odrl:duty>
--- a/examples/example7.ttl Mon May 12 10:45:51 2014 +0100
+++ b/examples/example7.ttl Mon May 12 10:48:31 2014 +0100
@@ -1,5 +1,5 @@
@prefix odrl: <http://w3.org/ns/odrl/2/> .
-@prefix p3p: <http://www.w3.org/2006/01/P3Pv11> .
+@prefix p3p: <http://www.w3.org/2002/01/p3prdfv1#> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
<http://example.com/policy:1111>