Skip to content

Commit

Permalink
Removed status property (Issue#16). Set Version to 2.2 for all schema…
Browse files Browse the repository at this point in the history 
…s (issue#10). Created all the skos:definition properties and copied from original Vocab spec and add all the rdfs:comments (issue#7)
  • Loading branch information
@riannella
riannella committed Jul 5, 2016
1 parent 3da0a7e commit fdf4369
Show file tree
Hide file tree
Showing 13 changed files with 1,970 additions and 344 deletions.
6 changes: 3 additions & 3 deletions vocab/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PHP ?= php

NSURI = http://www.w3.org/ns/odrl/2/

ALL = ODRL21.rdf ODRL21.nt index.html
ALL = ODRL22.rdf ODRL22.nt index.html

all: $(ALL)

Expand All @@ -18,5 +18,5 @@ clean:
%.nt: %.ttl
$(RAPPER) -i turtle -o ntriples $< > $@

index.html: ODRL21.ttl $(TOP)/tools/phpspecgen.php $(TOP)/tools/classes.php template.phtml
php -f $(TOP)/tools/phpspecgen.php -- $< '$(NSURI)' ODRL21 'template.phtml' > $@
index.html: ODRL22.ttl $(TOP)/tools/phpspecgen.php $(TOP)/tools/classes.php template.phtml
php -f $(TOP)/tools/phpspecgen.php -- $< '$(NSURI)' ODRL22 'template.phtml' > $@
6 changes: 3 additions & 3 deletions vocab/ODRL21.ttl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@

odrl:
a owl:Ontology , voaf:Vocabulary ;
rdfs:label "ODRL Version 2.2"@en ;
owl:versionInfo "2.2" ;
rdfs:label "ODRL Version 2.1"@en ;
owl:versionInfo "2.1" ;
vann:preferredNamespaceUri <http://w3.org/ns/odrl/2/> ;
vann:preferredNamespacePrefix "odrl" ;
vann:example :Asset ;
dct:creator "Mo McRoberts (BBC)", "Víctor Rodríguez Doncel (OEG-UPM)" ;
dct:issued "2016-06-13"^^xsd:date ;
dct:contributor "ODRL Community Group" ;
dct:description "ODRL provides flexible and interoperable mechanisms to support transparent and innovative use of digital content in publishing, distribution, and consumption 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 ;
rdfs:comment "This is the RDF ontology for ODRL Version 2.2 (working draft)."@en ;
rdfs:comment "This is the RDF ontology for ODRL Version 2.1 (working draft)."@en ;
dct:license <http://www.w3.org/community/about/agreements/final/> .

<http://www.w3.org/ns/odrl/2/ODRL21.ttl>
Expand Down
193 changes: 193 additions & 0 deletions vocab/ODRL22.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
{
"type": "object",
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "ODRL JSON Schema",
"description": "This is the JSON Schema for ODRL Version 2.2 Working Draft. Copyright © 2016 W3C (MIT, ERCIM, Keio, Beihang). W3C liability, trademark and document use rules apply.",
"id": "http://www.w3.org/ns/odrl/2/jsonschema#",
"definitions": {"prohibdutytype": {
"type": "array",
"items": {
"type": "object",
"required": ["action"],
"properties": {
"assigner": {
"type": "string",
"format": "uri"
},
"assignee": {
"type": "string",
"format": "uri"
},
"assignee_scope": {
"type": "string",
"format": "uri"
},
"target": {
"type": "string",
"format": "uri"
},
"output": {
"type": "string",
"format": "uri"
},
"action": {
"type": "string",
"format": "uri"
},
"constraints": {
"type": "array",
"items": {
"type": "object",
"required": [
"name",
"operator",
"rightoperand"
],
"properties": {
"name": {
"type": "string",
"format": "uri"
},
"operator": {
"type": "string",
"format": "uri"
},
"rightoperand": {"type": "string"},
"rightoperanddatatype": {"type": "string"},
"rightoperandunit": {"type": "string"},
"status": {"type": "string"}
}
}
}
},
"patternProperties": {
"^[a-z]+party": {
"type": "string",
"format": "uri"
},
"^[a-z]+_scope": {
"type": "string",
"format": "uri"
}
}
}
}},
"required": [
"policyid",
"policytype"
],
"properties": {
"policyid": {
"type": "string",
"format": "uri"
},
"policytype": {
"type": "string",
"format": "uri"
},
"conflict": {
"type": "string",
"enum": [
"perm",
"prohibit",
"invalid"
]
},
"undefined": {
"type": "string",
"enum": [
"support",
"ignore",
"invalid"
]
},
"inheritallowed": {"type": "boolean"},
"inheritfrom": {
"type": "string",
"format": "uri"
},
"inheritrelation": {
"type": "string",
"format": "uri"
},
"policyprofile": {
"type": "string",
"format": "uri"
},
"permissions": {
"type": "array",
"items": {
"type": "object",
"required": ["action"],
"properties": {
"assigner": {
"type": "string",
"format": "uri"
},
"assigner_scope": {
"type": "string",
"format": "uri"
},
"assignee": {
"type": "string",
"format": "uri"
},
"assignee_scope": {
"type": "string",
"format": "uri"
},
"target": {
"type": "string",
"format": "uri"
},
"output": {
"type": "string",
"format": "uri"
},
"action": {
"type": "string",
"format": "uri"
},
"constraints": {
"type": "array",
"items": {
"type": "object",
"required": [
"name",
"operator",
"rightoperand"
],
"properties": {
"name": {
"type": "string",
"format": "uri"
},
"operator": {
"type": "string",
"format": "uri"
},
"rightoperand": {"type": "string"},
"rightoperanddatatype": {"type": "string"},
"rightoperandunit": {"type": "string"},
"status": {"type": "string"}
}
}
},
"duties": {"$ref": "#/definitions/prohibdutytype"}
},
"patternProperties": {
"^[a-z]+party": {
"type": "string",
"format": "uri"
},
"^[a-z]+_scope": {
"type": "string",
"format": "uri"
}
}
}
},
"prohibitions": {"$ref": "#/definitions/prohibdutytype"}
}

}
Empty file added vocab/ODRL22.nt
View file
Empty file.
Empty file added vocab/ODRL22.rdf
View file
Empty file.
Loading

0 comments on commit fdf4369

Please sign in to comment.