Skip to content

Commit

Permalink
Fixed examples and swapped /Policy/rule/ for policyUsage #268
Browse files Browse the repository at this point in the history
  • Loading branch information
@riannella
riannella committed Oct 26, 2017
1 parent aecc518 commit af0b1a9
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions model/index.html
View file
Expand Up @@ -767,7 +767,7 @@ <h3>Constraint property with a Rule</h3>
</p>

<blockquote>
<p>Example Use Case: In the Policy Offer example below, the permission allows the target asset to be <code>distribute</code>d, and includes a constraint of a <code>dateTime</code> condition that the permission must be exercised before 2018-01-01.</p>
<p>Example Use Case: In the Policy Offer example below, the permission allows the target asset to be <code>distribute</code>d, and includes a constraint of a <code>dateTime</code> condition that the permission can only be exercised until 2018-01-01.</p>
</blockquote>

<pre id="eg1799" class="example hljs json">
Expand Down Expand Up @@ -1530,7 +1530,7 @@ <h4>Policy Metadata</h4>
"dc:issued": "2017-01-01T12:00",
"dc:coverage": { "@id": "https://www.iso.org/obp/ui/#iso:code:3166:AU-QLD" },
"dc:replaces": { "@id": "http://example.com/policy:8887" },
"permission": [{...}]
"permission": [ { } ]
}
</pre>

Expand Down
4 changes: 2 additions & 2 deletions vocab/ODRL22.nt
View file
Expand Up @@ -1258,8 +1258,8 @@ _:genid54 <http://www.w3.org/2002/07/owl#unionOf> _:genid53 .
<http://www.w3.org/ns/odrl/2/policyUsage> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2004/02/skos/core#Concept> .
<http://www.w3.org/ns/odrl/2/policyUsage> <http://www.w3.org/2000/01/rdf-schema#isDefinedBy> <http://www.w3.org/ns/odrl/2/> .
<http://www.w3.org/ns/odrl/2/policyUsage> <http://www.w3.org/2000/01/rdf-schema#label> "Policy Usage Time"@en .
<http://www.w3.org/ns/odrl/2/policyUsage> <http://www.w3.org/2004/02/skos/core#definition> "Indicates the time when the policy is exercised."@en .
<http://www.w3.org/ns/odrl/2/policyUsage> <http://www.w3.org/2004/02/skos/core#note> "This can be used to express constraints related to the time the policy is exercised. For example, <code>event lt policyUsage</code> expresses a constraint on the Action to occur before the policy is exercised. Other operators may be used to indicate during (eg) or after (gt, gte) policy usage."@en .
<http://www.w3.org/ns/odrl/2/policyUsage> <http://www.w3.org/2004/02/skos/core#definition> "Indicates the time when the policy rule is exercised."@en .
<http://www.w3.org/ns/odrl/2/policyUsage> <http://www.w3.org/2004/02/skos/core#note> "This can be used to express constraints related to the time the rule is exercised. For example, <code>event lt policyUsage</code> expresses a constraint on the Action to occur before the rule is exercised. Other operators may be used to indicate during (eg) or after (gt, gte) rule usage."@en .
<http://www.w3.org/ns/odrl/2/policyUsage> <http://www.w3.org/2004/02/skos/core#scopeNote> "Non-Normative"@en .
<http://www.w3.org/ns/odrl/2/use> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/odrl/2/Action> .
<http://www.w3.org/ns/odrl/2/use> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2004/02/skos/core#Concept> .
Expand Down
4 changes: 2 additions & 2 deletions vocab/ODRL22.rdf
View file
Expand Up @@ -1940,8 +1940,8 @@
<rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
<rdfs:isDefinedBy rdf:resource="http://www.w3.org/ns/odrl/2/"/>
<rdfs:label xml:lang="en">Policy Usage Time</rdfs:label>
<skos:definition xml:lang="en">Indicates the time when the policy is exercised.</skos:definition>
<skos:note xml:lang="en">This can be used to express constraints related to the time the policy is exercised. For example, &lt;code&gt;event lt policyUsage&lt;/code&gt; expresses a constraint on the Action to occur before the policy is exercised. Other operators may be used to indicate during (eg) or after (gt, gte) policy usage.</skos:note>
<skos:definition xml:lang="en">Indicates the time when the policy rule is exercised.</skos:definition>
<skos:note xml:lang="en">This can be used to express constraints related to the time the rule is exercised. For example, &lt;code&gt;event lt policyUsage&lt;/code&gt; expresses a constraint on the Action to occur before the rule is exercised. Other operators may be used to indicate during (eg) or after (gt, gte) rule usage.</skos:note>
<skos:scopeNote xml:lang="en">Non-Normative</skos:scopeNote>
</RightOperand>
<Action rdf:about="http://www.w3.org/ns/odrl/2/present">
Expand Down
4 changes: 2 additions & 2 deletions vocab/ODRL22.ttl
View file
Expand Up @@ -1302,8 +1302,8 @@ odrl:
a :RightOperand, owl:NamedIndividual, skos:Concept ;
rdfs:isDefinedBy odrl: ;
rdfs:label "Policy Usage Time"@en ;
skos:definition "Indicates the time when the policy is exercised."@en ;
skos:note "This can be used to express constraints related to the time the policy is exercised. For example, <code>event lt policyUsage</code> expresses a constraint on the Action to occur before the policy is exercised. Other operators may be used to indicate during (eg) or after (gt, gte) policy usage."@en ;
skos:definition "Indicates the time when the policy rule is exercised."@en ;
skos:note "This can be used to express constraints related to the time the rule is exercised. For example, <code>event lt policyUsage</code> expresses a constraint on the Action to occur before the rule is exercised. Other operators may be used to indicate during (eg) or after (gt, gte) rule usage."@en ;
skos:scopeNote "Non-Normative"@en .

## Actions
Expand Down
6 changes: 3 additions & 3 deletions vocab/index.html
View file
Expand Up @@ -1417,10 +1417,10 @@ <h2>ODRL Common Vocabulary</h2>
<tr><th>Class:</th> <td><a href="#term-LeftOperand">LeftOperand</a></td></tr>
</table>
</section></section><section id="constraintRightOpCommon"><h2>Constraint Right Operands</h2><section id="term-policyUsage"><h3>Policy Usage Time</h3><table class='def propdef' >
<tr><th>Definition:</th> <td>Indicates the time when the policy is exercised.</td></tr>
<tr><th>Definition:</th> <td>Indicates the time when the policy rule is exercised.</td></tr>
<tr><th>Label:</th> <td>Policy Usage Time</td></tr>
<tr><th>Identifier:</th> <td><a href="http://www.w3.org/ns/odrl/2/policyUsage">http://www.w3.org/ns/odrl/2/policyUsage</a></td></tr>
<tr><th>Note:</th> <td>This can be used to express constraints related to the time the policy is exercised. For example, <code>event lt policyUsage</code> expresses a constraint on the Action to occur before the policy is exercised. Other operators may be used to indicate during (eg) or after (gt, gte) policy usage.</td></tr>
<tr><th>Note:</th> <td>This can be used to express constraints related to the time the rule is exercised. For example, <code>event lt policyUsage</code> expresses a constraint on the Action to occur before the rule is exercised. Other operators may be used to indicate during (eg) or after (gt, gte) rule usage.</td></tr>
<tr><th>Class:</th> <td><a href="#term-RightOperand">RightOperand</a></td></tr>
</table>
</section></section>
Expand Down Expand Up @@ -1928,7 +1928,7 @@ <h2>Changes from Previous Versions</h2>
<p>Changes from the <a href="https://www.w3.org/TR/2017/CR-odrl-vocab-20170926//">Candidate Recommendation 26 September 2017</a>:</p>
<ul>
<li>Updated note of consequence property <a href="https://github.com/w3c/poe/issues/267">(Issue#267)</a> <a href="https://github.com/w3c/poe/issues/275">(Issue#275)</a> </li>
<li>Updated domain of uid property with Constraint/Logical Constraint classes <a href="https://github.com/w3c/poe/issues/278"> (Issue#278)</a></li>
<li>Updated domain of uid property with Constraint/Logical Constraint classes <a href="https://github.com/w3c/poe/issues/278"> (Issue#278)</a></li>
</ul></section>


Expand Down

0 comments on commit af0b1a9

Please sign in to comment.