From 0f0bb5a7cb6bb1d7a8c1c7d49c1a831ee5382253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arkadiusz=20Ry=C5=9B?= Date: Thu, 12 Jan 2023 05:58:37 +0100 Subject: [PATCH 1/6] Update documentation references from firesat to oml-template --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 610d292..a855766 100644 --- a/README.md +++ b/README.md @@ -45,19 +45,19 @@ Note: if bikeshed is not in the PATH, you can add -pBIKESHED=path/to/bikeshed ar ``` ./gradlew owlLoad ``` -Pre-req: A Fuseki server with a firesat dataset must be running at http://localhost:3030/firesat (see below) +Pre-req: A Fuseki server with the oml-template dataset must be running at http://localhost:3030/oml-template (see below) ## Run SPARQL Queries ``` ./gradlew owlQuery ``` -Pre-req: A Fuseki server with a firesat dataset must be running at http://localhost:3030/firesat (see below) +Pre-req: A Fuseki server with the oml-template dataset must be running at http://localhost:3030/oml-template (see below) ## Run SHACL Rules ``` ./gradlew owlShacl ``` -Pre-req: A Fuseki server with a firesat dataset must be running at http://localhost:3030/firesat (see below) +Pre-req: A Fuseki server with the oml-template dataset must be running at http://localhost:3030/oml-template (see below) ## Publish to Maven Local ``` From d11d9f32de4cc50a254940927083cd5c8b96eeda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arkadiusz=20Ry=C5=9B?= Date: Thu, 12 Jan 2023 06:02:06 +0100 Subject: [PATCH 2/6] Replace tabs with spaces in build.gradle to match the rest of the file --- build.gradle | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 767c402..e1cc385 100644 --- a/build.gradle +++ b/build.gradle @@ -99,13 +99,13 @@ task omlToBikeshed(type: io.opencaesar.oml.bikeshed.Oml2BikeshedTask, group:"oml * A task to generate the model documentation in HTML */ task generateDocs(type: Exec, dependsOn: omlToBikeshed) { - inputs.files(fileTree("$bikeshed").include('**/*.bs')) - outputs.files(fileTree("$bikeshed").include('**/*.html')) - if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { - commandLine "$bikeshed/publish.bat" - } else { - commandLine "$bikeshed/publish.sh" - } + inputs.files(fileTree("$bikeshed").include('**/*.bs')) + outputs.files(fileTree("$bikeshed").include('**/*.html')) + if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { + commandLine "$bikeshed/publish.bat" + } else { + commandLine "$bikeshed/publish.sh" + } } /* @@ -169,7 +169,7 @@ task owlLoad(type:io.opencaesar.owl.load.OwlLoadTask, group:"oml", dependsOn: ow * A task to run a set of SPARQL queries on a Fuseki dataset endpoint */ task owlQuery(type:io.opencaesar.owl.query.OwlQueryTask, group:"oml", dependsOn: owlLoad) { - inputs.files(owlLoad.inputs.files) // rerun when the dataset changes + inputs.files(owlLoad.inputs.files) // rerun when the dataset changes endpointURL = "http://localhost:3030/$dataset".toString() queryPath = file('src/sparql') resultPath = file('build/frames') @@ -179,7 +179,7 @@ task owlQuery(type:io.opencaesar.owl.query.OwlQueryTask, group:"oml", dependsOn: * A task to run a set of SHACL validation rules on a Fuseki dataset endpoint */ task owlShacl(type:io.opencaesar.owl.shacl.fuseki.OwlShaclFusekiTask, group:"oml", dependsOn: owlLoad) { - inputs.files(owlLoad.inputs.files) // rerun when the dataset changes + inputs.files(owlLoad.inputs.files) // rerun when the dataset changes endpointURL = "http://localhost:3030/$dataset".toString() queryPath = file('src/shacl') resultPath = file('build/reports') From 9ab67618db68e4e797fad62334dda78fcb498c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arkadiusz=20Ry=C5=9B?= Date: Thu, 12 Jan 2023 06:04:58 +0100 Subject: [PATCH 3/6] Replace tabs with spaces in .fuseki.ttl to match the rest of the file --- .fuseki.ttl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.fuseki.ttl b/.fuseki.ttl index c6c9ba1..f394140 100644 --- a/.fuseki.ttl +++ b/.fuseki.ttl @@ -8,17 +8,17 @@ [] rdf:type fuseki:Server . <#service> rdf:type fuseki:Service ; - rdfs:label "Oml Template" ; # Human readable label for dataset - fuseki:name "oml-template" ; # Name of the dataset in the endpoint url - fuseki:serviceReadWriteGraphStore "data" ; # SPARQL Graph store protocol (read and write) - fuseki:endpoint [ fuseki:operation fuseki:query ; fuseki:name "sparql" ] ; # SPARQL query service - fuseki:endpoint [ fuseki:operation fuseki:shacl ; fuseki:name "shacl" ] ; # SHACL query service + rdfs:label "Oml Template" ; # Human readable label for dataset + fuseki:name "oml-template" ; # Name of the dataset in the endpoint url + fuseki:serviceReadWriteGraphStore "data" ; # SPARQL Graph store protocol (read and write) + fuseki:endpoint [ fuseki:operation fuseki:query ; fuseki:name "sparql" ] ; # SPARQL query service + fuseki:endpoint [ fuseki:operation fuseki:shacl ; fuseki:name "shacl" ] ; # SHACL query service fuseki:dataset <#dataset> . # In memory TDB with union graph. -<#dataset> rdf:type tdb:DatasetTDB ; - tdb:location "--mem--" ; - # Query timeout on this dataset (1s, 1000 milliseconds) - ja:context [ ja:cxtName "arq:queryTimeout" ; ja:cxtValue "1000" ] ; - # Make the default graph be the union of all named graphs. - tdb:unionDefaultGraph true . +<#dataset> rdf:type tdb:DatasetTDB ; + tdb:location "--mem--" ; + # Query timeout on this dataset (1s, 1000 milliseconds) + ja:context [ ja:cxtName "arq:queryTimeout" ; ja:cxtValue "1000" ] ; + # Make the default graph be the union of all named graphs. + tdb:unionDefaultGraph true . From e12fc6fa73758d8696ec23b3e3b3ad327aa44608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arkadiusz=20Ry=C5=9B?= Date: Thu, 12 Jan 2023 06:07:37 +0100 Subject: [PATCH 4/6] Remove extra whitespace --- src/oml/opencaesar.io/template/description/bundle.oml | 6 +++--- src/oml/opencaesar.io/template/description/description1.oml | 6 +++--- src/oml/opencaesar.io/template/vocabulary/bundle.oml | 4 ++-- src/oml/opencaesar.io/template/vocabulary/vocabulary1.oml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/oml/opencaesar.io/template/description/bundle.oml b/src/oml/opencaesar.io/template/description/bundle.oml index f29c6af..d928e52 100644 --- a/src/oml/opencaesar.io/template/description/bundle.oml +++ b/src/oml/opencaesar.io/template/description/bundle.oml @@ -2,11 +2,11 @@ @dc:creator "Example Company" @dc:rights "Copyright 2019, by Example Company" description bundle as description-bundle { - - uses as dc + + uses as dc uses - + includes } diff --git a/src/oml/opencaesar.io/template/description/description1.oml b/src/oml/opencaesar.io/template/description/description1.oml index 4b1c757..e360b5f 100644 --- a/src/oml/opencaesar.io/template/description/description1.oml +++ b/src/oml/opencaesar.io/template/description/description1.oml @@ -2,17 +2,17 @@ @dc:creator "Example Company" @dc:rights "Copyright 2019, by Example Company" description as description1 { - + uses as dc uses as vocabulary1 // Example concept instance ci c1 : vocabulary1:C - + // Example concept instance ci c2 : vocabulary1:C - + // Example relation instance ri r1 : vocabulary1:R [ from c1 diff --git a/src/oml/opencaesar.io/template/vocabulary/bundle.oml b/src/oml/opencaesar.io/template/vocabulary/bundle.oml index ed6017a..87e7ce3 100644 --- a/src/oml/opencaesar.io/template/vocabulary/bundle.oml +++ b/src/oml/opencaesar.io/template/vocabulary/bundle.oml @@ -2,8 +2,8 @@ @dc:creator "Example Company" @dc:rights "Copyright 2019, by Example Company" vocabulary bundle as vocabulary-bundle { - - includes as dc + + includes as dc includes diff --git a/src/oml/opencaesar.io/template/vocabulary/vocabulary1.oml b/src/oml/opencaesar.io/template/vocabulary/vocabulary1.oml index 102eeb5..0d70263 100644 --- a/src/oml/opencaesar.io/template/vocabulary/vocabulary1.oml +++ b/src/oml/opencaesar.io/template/vocabulary/vocabulary1.oml @@ -2,9 +2,9 @@ @dc:creator "Example Company" @dc:rights "Copyright 2019, by Example Company" vocabulary as vocabulary1 { - + extends as dc - + // Example aspect aspect A From 4898332c5e127cff5c38fd9d242f71909cd81a5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arkadiusz=20Ry=C5=9B?= Date: Thu, 12 Jan 2023 06:09:11 +0100 Subject: [PATCH 5/6] Remove whitespace from README clone command to put it in line with the rest --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a855766..993d891 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,8 @@ This repository has a template [OML](https://github.com/opencaesar/oml) project. ## Clone ``` - git clone https://github.com/opencaesar/oml-template.git - cd oml-template +git clone https://github.com/opencaesar/oml-template.git +cd oml-template ``` ## Build From 204280a1ff36f4c4e24902973e6dada93ef213c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arkadiusz=20Ry=C5=9B?= Date: Thu, 12 Jan 2023 06:11:44 +0100 Subject: [PATCH 6/6] Remove extra whitespace in README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 993d891..0ff9244 100644 --- a/README.md +++ b/README.md @@ -45,19 +45,19 @@ Note: if bikeshed is not in the PATH, you can add -pBIKESHED=path/to/bikeshed ar ``` ./gradlew owlLoad ``` -Pre-req: A Fuseki server with the oml-template dataset must be running at http://localhost:3030/oml-template (see below) +Pre-req: A Fuseki server with the oml-template dataset must be running at http://localhost:3030/oml-template (see below) ## Run SPARQL Queries ``` ./gradlew owlQuery ``` -Pre-req: A Fuseki server with the oml-template dataset must be running at http://localhost:3030/oml-template (see below) +Pre-req: A Fuseki server with the oml-template dataset must be running at http://localhost:3030/oml-template (see below) ## Run SHACL Rules ``` ./gradlew owlShacl ``` -Pre-req: A Fuseki server with the oml-template dataset must be running at http://localhost:3030/oml-template (see below) +Pre-req: A Fuseki server with the oml-template dataset must be running at http://localhost:3030/oml-template (see below) ## Publish to Maven Local ```