From 34a924d5fc92866a2db1aca66d2b33eca9bf4dba Mon Sep 17 00:00:00 2001 From: Mark Wilkinson Date: Tue, 28 Nov 2023 09:15:11 +0100 Subject: [PATCH] Update base vocabulary URI --- data/example-rdf/turtle/biobank.ttl | 2 +- data/example-rdf/turtle/catalog.ttl | 2 +- data/example-rdf/turtle/guideline.ttl | 2 +- data/example-rdf/turtle/patientRegistry.ttl | 2 +- docs/biobank.md | 4 +-- docs/catalog.md | 10 +++--- docs/dataset.md | 6 ++-- docs/guideline.md | 4 +-- docs/patient-registry.md | 4 +-- images/shex/biobank.svg | 36 ++++++++++----------- images/shex/catalog.svg | 34 +++++++++---------- images/shex/guideline.svg | 26 +++++++-------- images/shex/patientRegistry.svg | 36 ++++++++++----------- shapes/biobank.shex | 6 ++-- shapes/catalog.shex | 4 +-- shapes/dataservices.shex | 4 +-- shapes/dataset.shex | 4 +-- shapes/distribution.shex | 2 +- shapes/guideline.shex | 4 +-- shapes/patientRegistry.shex | 4 +-- shapes/resource.shex | 4 +-- template/Biobank.md | 2 +- template/Catalog.md | 2 +- template/DataService.md | 6 ++-- template/Dataset.md | 2 +- template/Guideline.md | 6 ++-- template/PatientRegistry.md | 2 +- 27 files changed, 110 insertions(+), 110 deletions(-) diff --git a/data/example-rdf/turtle/biobank.ttl b/data/example-rdf/turtle/biobank.ttl index 3851705..be9a3f6 100644 --- a/data/example-rdf/turtle/biobank.ttl +++ b/data/example-rdf/turtle/biobank.ttl @@ -1,7 +1,7 @@ @prefix : . @prefix dcat: . @prefix dct: . -@prefix ejp: . +@prefix ejp: . @prefix foaf: . @prefix sio: . @prefix rdfs: . diff --git a/data/example-rdf/turtle/catalog.ttl b/data/example-rdf/turtle/catalog.ttl index 20ac307..b79ff3b 100644 --- a/data/example-rdf/turtle/catalog.ttl +++ b/data/example-rdf/turtle/catalog.ttl @@ -1,7 +1,7 @@ @prefix : . @prefix dcat: . @prefix dct: . -@prefix ejp: . +@prefix ejp: . @prefix foaf: . :location a dct:Location ; diff --git a/data/example-rdf/turtle/guideline.ttl b/data/example-rdf/turtle/guideline.ttl index 4a8b1b7..f36db63 100644 --- a/data/example-rdf/turtle/guideline.ttl +++ b/data/example-rdf/turtle/guideline.ttl @@ -1,7 +1,7 @@ @prefix : . @prefix dcat: . @prefix dct: . -@prefix ejp: . +@prefix ejp: . @prefix foaf: . @prefix rdfs: . @prefix obo: . diff --git a/data/example-rdf/turtle/patientRegistry.ttl b/data/example-rdf/turtle/patientRegistry.ttl index ef38e83..65e8531 100644 --- a/data/example-rdf/turtle/patientRegistry.ttl +++ b/data/example-rdf/turtle/patientRegistry.ttl @@ -1,7 +1,7 @@ @prefix : . @prefix dcat: . @prefix dct: . -@prefix ejp: . +@prefix ejp: . @prefix foaf: . @prefix sio: . @prefix rdfs: . diff --git a/docs/biobank.md b/docs/biobank.md index f66de3d..2dc48be 100644 --- a/docs/biobank.md +++ b/docs/biobank.md @@ -18,7 +18,7 @@ @prefix : . @prefix dcat: . @prefix dct: . -@prefix ejp: . +@prefix ejp: . @prefix foaf: . @prefix sio: . @prefix rdfs: . @@ -64,7 +64,7 @@ ordo:Orphanet_171895 a skos:Concept . # Declaration to comply with dcat:theme ra PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejp: +PREFIX ejp: PREFIX foaf: PREFIX xsd: PREFIX sio: diff --git a/docs/catalog.md b/docs/catalog.md index 97b8558..180b24c 100644 --- a/docs/catalog.md +++ b/docs/catalog.md @@ -15,7 +15,7 @@ @prefix : . @prefix dcat: . @prefix dct: . -@prefix ejp: . +@prefix ejp: . @prefix foaf: . :location a dct:Location ; @@ -50,7 +50,7 @@ PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejp: +PREFIX ejp: PREFIX foaf: PREFIX xsd: @@ -88,7 +88,7 @@ The properties `ejp:patientRegistry`, `ejp:biobank`, `ejp:guideline` are mention @prefix : . @prefix dcat: . @prefix dct: . -@prefix ejp: . +@prefix ejp: . @prefix foaf: . :location a dct:Location ; @@ -112,7 +112,7 @@ The properties `ejp:patientRegistry`, `ejp:biobank`, `ejp:guideline` are mention @prefix : . @prefix dcat: . @prefix dct: . -@prefix ejp: . +@prefix ejp: . @prefix foaf: . :location a dct:Location ; @@ -137,7 +137,7 @@ The properties `ejp:patientRegistry`, `ejp:biobank`, `ejp:guideline` are mention @prefix : . @prefix dcat: . @prefix dct: . -@prefix ejp: . +@prefix ejp: . @prefix foaf: . :location a dct:Location ; diff --git a/docs/dataset.md b/docs/dataset.md index 260ae02..84e27b4 100644 --- a/docs/dataset.md +++ b/docs/dataset.md @@ -60,7 +60,7 @@ DCAT vocabulary has already has concept `dcat:Dataset` which is a sub-class of ` PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejp: +PREFIX ejp: PREFIX foaf: PREFIX xsd: PREFIX sio: @@ -155,7 +155,7 @@ Often a dataset can be made available for use via data dump such as RDF,mysql da PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejp: +PREFIX ejp: PREFIX foaf: PREFIX xsd: @@ -247,7 +247,7 @@ When you create a distribution entry please make sure that the distribution entr PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejp: +PREFIX ejp: PREFIX foaf: PREFIX xsd: diff --git a/docs/guideline.md b/docs/guideline.md index 02dbfe7..04ff49b 100644 --- a/docs/guideline.md +++ b/docs/guideline.md @@ -17,7 +17,7 @@ @prefix : . @prefix dcat: . @prefix dct: . -@prefix ejp: . +@prefix ejp: . @prefix foaf: . @prefix rdfs: . @prefix obo: . @@ -51,7 +51,7 @@ PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejp: +PREFIX ejp: PREFIX foaf: PREFIX xsd: PREFIX rdfs: diff --git a/docs/patient-registry.md b/docs/patient-registry.md index aca6160..23e0eed 100644 --- a/docs/patient-registry.md +++ b/docs/patient-registry.md @@ -17,7 +17,7 @@ @prefix : . @prefix dcat: . @prefix dct: . -@prefix ejp: . +@prefix ejp: . @prefix foaf: . @prefix sio: . @prefix rdfs: . @@ -60,7 +60,7 @@ PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejp: +PREFIX ejp: PREFIX foaf: PREFIX xsd: PREFIX sio: diff --git a/images/shex/biobank.svg b/images/shex/biobank.svg index 0b18ff6..71d711d 100644 --- a/images/shex/biobank.svg +++ b/images/shex/biobank.svg @@ -1,16 +1,16 @@ -:biobankShapeIRIa: [ejp:Biobank]dct:title:xsd:stringdct:description:xsd:string*dcat:theme: IRI +foaf:page: IRI *:locationShapeIRIa: [dct:Location]dct:title:xsd:stringdct:description:xsd:string*:organisationShapeIRIa: [foaf:Organisation]dct:title:xsd:stringdct:description:xsd:string*foaf:page: IRI *:populationCoverageShapeIRIa: [sio:SIO_001166]rdfs:label: [ National International Regional ]dct:spatialejp:populationCoverage*dct:publisherGenerated byrdfshape:biobankShapeIRIa: [ejp:Biobank]dct:title:xsd:stringdct:description:xsd:string*dcat:theme: IRI +foaf:page: IRI *:locationShapeIRIa: [dct:Location]dct:title:xsd:stringdct:description:xsd:string*:organisationShapeIRIa: [foaf:Organisation]dct:title:xsd:stringdct:description:xsd:string*foaf:page: IRI *:populationCoverageShapeIRIa: [sio:SIO_001166]rdfs:label: [ National International Regional ]dct:spatialejp:populationCoverage*dct:publisherGenerated byrdfshape \ No newline at end of file diff --git a/images/shex/catalog.svg b/images/shex/catalog.svg index b8f02d4..eea4846 100644 --- a/images/shex/catalog.svg +++ b/images/shex/catalog.svg @@ -1,9 +1,9 @@ -:catalogShapeIRIa: [dcat:Catalog]dct:title:xsd:stringdct:description:xsd:string*ejp:patientRegistry: IRI *ejp:biobank: IRI *ejp:guideline: IRI *:locationShapeIRIa: [dct:Location]dct:title:xsd:stringdct:description:xsd:string*:organisationShapeIRIa: [foaf:Organisation]dct:title:xsd:stringdct:description:xsd:string*foaf:page: IRIdct:spatial*dct:publisherGenerated byrdfshape:catalogShapeIRIa: [dcat:Catalog]dct:title:xsd:stringdct:description:xsd:string*ejp:patientRegistry: IRI *ejp:biobank: IRI *ejp:guideline: IRI *:locationShapeIRIa: [dct:Location]dct:title:xsd:stringdct:description:xsd:string*:organisationShapeIRIa: [foaf:Organisation]dct:title:xsd:stringdct:description:xsd:string*foaf:page: IRIdct:spatial*dct:publisherGenerated byrdfshape \ No newline at end of file diff --git a/images/shex/guideline.svg b/images/shex/guideline.svg index 85f097f..a0d41bd 100644 --- a/images/shex/guideline.svg +++ b/images/shex/guideline.svg @@ -1,12 +1,12 @@ -:guidelineShapeIRIa: [ejp:Guideline]dct:title:xsd:stringdct:description:xsd:string*dcat:theme: IRI +foaf:page: IRI *:organisationShapeIRIa: [foaf:Organisation]dct:title:xsd:stringdct:description:xsd:string*foaf:page: IRI *dct:publisherGenerated byrdfshape:guidelineShapeIRIa: [ejp:Guideline]dct:title:xsd:stringdct:description:xsd:string*dcat:theme: IRI +foaf:page: IRI *:organisationShapeIRIa: [foaf:Organisation]dct:title:xsd:stringdct:description:xsd:string*foaf:page: IRI *dct:publisherGenerated byrdfshape \ No newline at end of file diff --git a/images/shex/patientRegistry.svg b/images/shex/patientRegistry.svg index 1adbaa2..2191780 100644 --- a/images/shex/patientRegistry.svg +++ b/images/shex/patientRegistry.svg @@ -1,16 +1,16 @@ -:patientRegistryShapeIRIa: [ejp:PatientRegistry]dct:title:xsd:stringdct:description:xsd:string*dcat:theme: IRI +foaf:page: IRI *:locationShapeIRIa: [dct:Location]dct:title:xsd:stringdct:description:xsd:string*:organisationShapeIRIa: [foaf:Organisation]dct:title:xsd:stringdct:description:xsd:string*foaf:page: IRI *:populationCoverageShapeIRIa: [sio:SIO_001166]rdfs:label: [ National International Regional ]dct:spatial*ejp:populationCoverage*dct:publisherGenerated byrdfshape:patientRegistryShapeIRIa: [ejp:PatientRegistry]dct:title:xsd:stringdct:description:xsd:string*dcat:theme: IRI +foaf:page: IRI *:locationShapeIRIa: [dct:Location]dct:title:xsd:stringdct:description:xsd:string*:organisationShapeIRIa: [foaf:Organisation]dct:title:xsd:stringdct:description:xsd:string*foaf:page: IRI *:populationCoverageShapeIRIa: [sio:SIO_001166]rdfs:label: [ National International Regional ]dct:spatial*ejp:populationCoverage*dct:publisherGenerated byrdfshape \ No newline at end of file diff --git a/shapes/biobank.shex b/shapes/biobank.shex index de75ce8..04ff536 100644 --- a/shapes/biobank.shex +++ b/shapes/biobank.shex @@ -1,13 +1,13 @@ PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejprd: +PREFIX ejprd: PREFIX foaf: PREFIX xsd: PREFIX sio: PREFIX rdfs: PREFIX odrl: -PREFIX ejprd: +PREFIX ejprd: :biobankShape IRI { a [ejrdp:Biobank]; @@ -22,7 +22,7 @@ PREFIX ejprd: dct:language xsd:string+; ejprd:populationCoverage ["National" "International" "Regional" "European"]; ejprd:personalData xsd:string?; - ejprd:vpConnection [ ]; + ejprd:vpConnection [ ]; dct:accessRights IRI?; odrl:hasPolicy IRI?; dct:conformsTo IRI? diff --git a/shapes/catalog.shex b/shapes/catalog.shex index acc451e..1d98ed2 100644 --- a/shapes/catalog.shex +++ b/shapes/catalog.shex @@ -3,7 +3,7 @@ PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejprd: +PREFIX ejprd: PREFIX foaf: PREFIX sio: PREFIX xsd: @@ -74,7 +74,7 @@ PREFIX odrl: dcat:distribution IRI*; dct:language xsd:string+; ejprd:personalData xsd:string?; - ejprd:vpConnection [ ]; + ejprd:vpConnection [ ]; dct:conformsTo IRI? } diff --git a/shapes/dataservices.shex b/shapes/dataservices.shex index bb40861..830e003 100644 --- a/shapes/dataservices.shex +++ b/shapes/dataservices.shex @@ -1,7 +1,7 @@ PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejprd: +PREFIX ejprd: PREFIX foaf: PREFIX xsd: PREFIX odrl: @@ -22,7 +22,7 @@ PREFIX odrl: dct:accessRights IRI?; odrl:hasPolicy IRI?; ejprd:personalData xsd:string?; - ejprd:vpConnection [ ] + ejprd:vpConnection [ ] } :locationShape IRI { diff --git a/shapes/dataset.shex b/shapes/dataset.shex index 9d9ce86..3b6b440 100644 --- a/shapes/dataset.shex +++ b/shapes/dataset.shex @@ -1,7 +1,7 @@ PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejprd: +PREFIX ejprd: PREFIX foaf: PREFIX xsd: PREFIX sio: @@ -25,7 +25,7 @@ PREFIX odrl: dct:accessRights IRI?; odrl:hasPolicy IRI?; ejprd:personalData xsd:string?; - ejprd:vpConnection [ ] + ejprd:vpConnection [ ] } :locationShape IRI { diff --git a/shapes/distribution.shex b/shapes/distribution.shex index 9a623ba..90b893c 100644 --- a/shapes/distribution.shex +++ b/shapes/distribution.shex @@ -1,7 +1,7 @@ PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejp: +PREFIX ejp: PREFIX foaf: PREFIX xsd: PREFIX odrl: diff --git a/shapes/guideline.shex b/shapes/guideline.shex index 830b3f0..587a378 100644 --- a/shapes/guideline.shex +++ b/shapes/guideline.shex @@ -1,7 +1,7 @@ PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejprd: +PREFIX ejprd: PREFIX foaf: PREFIX xsd: PREFIX rdfs: @@ -22,7 +22,7 @@ PREFIX odrl: dct:conformsTo IRI?; dct:accessRights IRI?; odrl:hasPolicy IRI?; - ejprd:vpConnection [ ]; + ejprd:vpConnection [ ]; ejprd:personalData xsd:string? } diff --git a/shapes/patientRegistry.shex b/shapes/patientRegistry.shex index a438ff8..31ebd92 100644 --- a/shapes/patientRegistry.shex +++ b/shapes/patientRegistry.shex @@ -1,7 +1,7 @@ PREFIX : PREFIX dcat: PREFIX dct: -PREFIX ejprd: +PREFIX ejprd: PREFIX foaf: PREFIX xsd: PREFIX sio: @@ -24,7 +24,7 @@ PREFIX odrl: dct:accessRights IRI?; odrl:hasPolicy IRI?; ejprd:personalData xsd:string?; - ejprd:vpConnection [ ] + ejprd:vpConnection [ ] } :locationShape IRI { diff --git a/shapes/resource.shex b/shapes/resource.shex index 61c9479..1bad2ad 100644 --- a/shapes/resource.shex +++ b/shapes/resource.shex @@ -5,7 +5,7 @@ PREFIX foaf: PREFIX xsd: PREFIX rdfs: PREFIX odrl: -PREFIX ejprd: +PREFIX ejprd: :resourceShape IRI { a [dcat:Resource]; @@ -23,7 +23,7 @@ PREFIX ejprd: dct:accessRights IRI?; odrl:hasPolicy IRI?; ejprd:personalData xsd:string; - ejprd:vpConnection [ ] + ejprd:vpConnection [ ] } :organisationShape IRI { diff --git a/template/Biobank.md b/template/Biobank.md index 837a302..22ccea7 100644 --- a/template/Biobank.md +++ b/template/Biobank.md @@ -109,7 +109,7 @@ NOT Dataset Z). If you do not add this tag to at least the description of your resource, you will not be onboarded. -The range is [http://purl.org/ejp-rd/vocabulary/VPDiscoverable](http://purl.org/ejp-rd/vocabulary/VPDiscoverable). +The range is [https://w3id.org/ejp-rd/vocabulary#VPDiscoverable](https://w3id.org/ejp-rd/vocabulary#VPDiscoverable). > **Note** This field is `optional` diff --git a/template/Catalog.md b/template/Catalog.md index 263f7fc..aa304d9 100644 --- a/template/Catalog.md +++ b/template/Catalog.md @@ -105,7 +105,7 @@ NOT Dataset Z). If you do not add this tag to at least the description of your resource, you will not be onboarded. -The range is [http://purl.org/ejp-rd/vocabulary/VPDiscoverable](http://purl.org/ejp-rd/vocabulary/VPDiscoverable). +The range is [https://w3id.org/ejp-rd/vocabulary#VPDiscoverable](https://w3id.org/ejp-rd/vocabulary#VPDiscoverable). > **Note** This field is `optional` diff --git a/template/DataService.md b/template/DataService.md index f61f5be..4954335 100644 --- a/template/DataService.md +++ b/template/DataService.md @@ -23,8 +23,8 @@ e.g. [http://creativecommons.org/licenses/by-nc-nd/4.0](http://creativecommons.o ## Type In the context of a Data Service, if the service is a Beacon, the range is either dcterms:type -[http://purl.org/ejp-rd/vocabulary/VPBeacon2_individuals](http://purl.org/ejp-rd/vocabulary/VPBeacon2_individuals) or -[http://purl.org/ejp-rd/vocabulary/VPBeacon2_catalog](http://purl.org/ejp-rd/vocabulary/VPBeacon2_catalog). +[https://w3id.org/ejp-rd/vocabulary#VPBeacon2_individuals](https://w3id.org/ejp-rd/vocabulary#VPBeacon2_individuals) or +[https://w3id.org/ejp-rd/vocabulary#VPBeacon2_catalog](https://w3id.org/ejp-rd/vocabulary#VPBeacon2_catalog). If the service is anything besides a Beacon, use one of the children of [EDAM Operation](http://edamontology.org/operation_0004). @@ -134,7 +134,7 @@ NOT Dataset Z). If you do not add this tag to at least the description of your resource, you will not be onboarded. -The range is [http://purl.org/ejp-rd/vocabulary/VPDiscoverable](http://purl.org/ejp-rd/vocabulary/VPDiscoverable). +The range is [https://w3id.org/ejp-rd/vocabulary#VPDiscoverable](https://w3id.org/ejp-rd/vocabulary#VPDiscoverable). > **Note** This field is `optional` diff --git a/template/Dataset.md b/template/Dataset.md index abcb21a..7804158 100644 --- a/template/Dataset.md +++ b/template/Dataset.md @@ -99,7 +99,7 @@ NOT Dataset Z). If you do not add this tag to at least the description of your resource, you will not be onboarded. -The range is [http://purl.org/ejp-rd/vocabulary/VPDiscoverable](http://purl.org/ejp-rd/vocabulary/VPDiscoverable). +The range is [https://w3id.org/ejp-rd/vocabulary#VPDiscoverable](https://w3id.org/ejp-rd/vocabulary#VPDiscoverable). > **Note** This field is `optional` diff --git a/template/Guideline.md b/template/Guideline.md index ca1c68d..a6127c7 100644 --- a/template/Guideline.md +++ b/template/Guideline.md @@ -131,7 +131,7 @@ NOT Dataset Z). If you do not add this tag to at least the description of your resource, you will not be onboarded. -The range is [http://purl.org/ejp-rd/vocabulary/VPDiscoverable](http://purl.org/ejp-rd/vocabulary/VPDiscoverable). +The range is [https://w3id.org/ejp-rd/vocabulary#VPDiscoverable](https://w3id.org/ejp-rd/vocabulary#VPDiscoverable). > **Note** This field is `optional` @@ -176,8 +176,8 @@ If applicable, it should point to the IRI an established standard to which the d ## Type Defines the type of this resource which for the EJP RD Virtual Platform can be one of the following: -- http://purl.org/ejp-rd/vocabulary/VPBeacon2_individuals: the annotated resource (always a DataService) provides the Beacon2 /individuals interface -- http://purl.org/ejp-rd/vocabulary/VPBeacon2_catalog: the annotated resource (always a DataService) provides the Beacon2 /catalog interface +- https://w3id.org/ejp-rd/vocabulary#VPBeacon2_individuals: the annotated resource (always a DataService) provides the Beacon2 /individuals interface +- https://w3id.org/ejp-rd/vocabulary#VPBeacon2_catalog: the annotated resource (always a DataService) provides the Beacon2 /catalog interface > **Warning** This field is `required`> **Warning** This field is `required` ## Publisher diff --git a/template/PatientRegistry.md b/template/PatientRegistry.md index cca7a82..59bc5ed 100644 --- a/template/PatientRegistry.md +++ b/template/PatientRegistry.md @@ -109,7 +109,7 @@ NOT Dataset Z). If you do not add this tag to at least the description of your resource, you will not be onboarded. -The range is [http://purl.org/ejp-rd/vocabulary/VPDiscoverable](http://purl.org/ejp-rd/vocabulary/VPDiscoverable). +The range is [https://w3id.org/ejp-rd/vocabulary#VPDiscoverable](https://w3id.org/ejp-rd/vocabulary#VPDiscoverable). > **Note** This field is `optional`