Change Ontology IRI (#269)

* Change ontology iri * Fix uri and test * Replace old iri * Add ontology deployment to ftp server * update rdf files * Didn't find any spot where the nt files ar used. Removing them * Remove old test files * Update deployment workflow * delete outdated files --------- Co-authored-by: bigerl <[email protected]>
dice-group · Oct 1, 2024 · a465547 · a465547
1 parent 033ef0b
commit a465547
Show file tree

Hide file tree

Showing 64 changed files with 60 additions and 61,154 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -80,6 +80,10 @@ jobs:
           java-version: '17'
           distribution: 'adopt'
           cache: 'maven'
+      - name: Install lftp
+        run: |
+          sudo apt-get update
+          sudo apt-get install lftp
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
@@ -127,13 +131,23 @@ jobs:
       - run: cp schema/iguana.owx ontology/${{ steps.find_ontology_version.outputs.ONTOLOGY_VERSION }}/iguana.owx
       - run: cp schema/iguana.owx ontology/iguana.owx
 
-      - name: Deploy Ontology
+      - name: Deploy Ontology to GitHub Pages
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./ontology/
           destination_dir: ./ontology/
 
+      - name: Deploy Ontology to FTP
+        run: |
+          lftp -u ${{ secrets.FTP_USERNAME }},${{ secrets.FTP_PASSWORD }} files.dice-research.org << EOF
+              set cmd:fail-exit yes
+              set ftp:ssl-protect-data true
+              cd /vocab
+              mirror -R ontology/. iguana/
+              bye
+              EOF
+
 
   deploy_gh_release:
     name: Publish GitHub Release

diff --git a/docs/configuration/overview.md b/docs/configuration/overview.md
@@ -179,7 +179,7 @@ For the csv storage, the above configuration might result with the following `ta
 
 | taskID                                                      | connection | version | dataset |
 |-------------------------------------------------------------|------------|---------|---------|
-| http://iguana-benchmark.eu/resource/1699354119-3273189568/0 | fuseki     | v2      | sp2b    | 
+|  https://vocab.dice-research.org/iguana/resource/1699354119-3273189568/0 | fuseki     | v2      | sp2b    | 
 
 The resulting triples for the rdf file storage might look like this:
 

diff --git a/docs/configuration/rdf_results.md b/docs/configuration/rdf_results.md
@@ -7,7 +7,7 @@ The first excerpt shows the results for the task `ires:1710247002-3043500295/0`
 `ires:1710247002-3043500295/0/0`:
 
 ```turtle
-<http://iguana-benchmark.eu/resource/1710247002-3043500295/0>
+< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0>
         a                     iont:Stresstest , iont:Task ;
         iprop:AvgQPS          84.121083502 ;
         iprop:NoQ             16 ;
@@ -18,9 +18,9 @@ The first excerpt shows the results for the task `ires:1710247002-3043500295/0`
         iprop:noOfWorkers     "1"^^<http://www.w3.org/2001/XMLSchema#int> ;
         iprop:query           (iri of every query that has been executed inside the task) ;
         iprop:startDate       "2024-03-12T12:36:42.636Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> ;
-        iprop:workerResult    <http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0> .
+        iprop:workerResult    < https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0> .
 
-<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0>
+< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0>
         a                  iont:Worker ;
         iprop:AvgQPS       84.121083502 ;
         iprop:NoQ          16 ;
@@ -73,7 +73,7 @@ It consists of a hash value of the query handler and the query id in this format
 In this example, results for the query `ires:1181728761:0` are shown:
 
 ```turtle
-<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/1181728761:0>
+< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/1181728761:0>
         a                       iont:ExecutedQuery ;
         iprop:QPS               18.975908187 ;
         iprop:failed            0 ;
@@ -85,11 +85,11 @@ In this example, results for the query `ires:1181728761:0` are shown:
         iprop:unknownException  0 ;
         iprop:wrongCodes        0 .
 
-<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0>
+< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0>
         a                       iont:ExecutedQuery ;
         iprop:QPS               18.975908187 ;
         iprop:failed            0 ;
-        iprop:queryExecution    <http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0/1> ;
+        iprop:queryExecution    < https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0/1> ;
         iprop:queryID           ires:1181728761:0 ;
         iprop:resultSize        212 ;
         iprop:succeeded         1 ;
@@ -99,7 +99,7 @@ In this example, results for the query `ires:1181728761:0` are shown:
         iprop:wrongCodes        0 .
 ```
 
-The IRI `<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0>` consists of the following
+The IRI `< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0>` consists of the following
 segments:
 - `ires:1710247002-3043500295` is the IRI of the benchmark suite.
 - `ires:1710247002-3043500295/0` is the IRI of the first task.
@@ -109,16 +109,16 @@ segments:
 The suite id is made up of the timestamp and the hash value of the suite configuration in this pattern:
 `ires:<timestamp>-<hash>`.
 
-The subject `<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0>` represents the results of the query
+The subject `< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0>` represents the results of the query
 `ires:1181728761:0` from first worker of the task `1710247002-3043500295/0`.
 
-The subject `<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/1181728761:0>` represents the results of the query
+The subject `< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/1181728761:0>` represents the results of the query
 `ires:1181728761:0` from every worker across the whole task `1710247002-3043500295/0`.
 
 Results of query metrics, like the `QPS` metric (also the `AES` metric),
 are therefore calculated for each query of each worker and for each query of the whole task.
 
-The `iprop:queryExecution` property of `<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0>` 
+The `iprop:queryExecution` property of `< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0>` 
 contains the IRIs of the executions of that query from that worker.
 These will be explained in the next section.
 
@@ -128,19 +128,19 @@ With the `EachQuery` metric Iguana stores the statistics of each execution of a
 The following excerpt shows the execution statistics of the query `ires:1181728761:0`:
 
 ```turtle
-<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0/1>
+< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0/1>
         iprop:code          "0"^^<http://www.w3.org/2001/XMLSchema#int> ;
         iprop:httpCode      "200" ;
         iprop:queryID       ires:1181728761:0 ;
-        iprop:responseBody  <http://iguana-benchmark.eu/resource/responseBody/-3025899826584824492> ;
+        iprop:responseBody  < https://vocab.dice-research.org/iguana/resource/responseBody/-3025899826584824492> ;
         iprop:resultSize    "212"^^<http://www.w3.org/2001/XMLSchema#long> ;
         iprop:run           1 ;
         iprop:startTime     "2024-03-12T12:36:42.647764Z"^^<http://www.w3.org/2001/XMLSchema#dateTime> ;
         iprop:success       true ;
         iprop:time          "PT0.0526984S"^^<http://www.w3.org/2001/XMLSchema#dayTimeDuration> .
 ```
 
-The IRI `<http://iguana-benchmark.eu/resource/1710247002-3043500295/0/0/1181728761:0/1>` consists of the worker
+The IRI `< https://vocab.dice-research.org/iguana/resource/1710247002-3043500295/0/0/1181728761:0/1>` consists of the worker
 query IRI as described above and the run number of the query execution.
 
 The properties of the `EachQuery` metric are described in the [metrics](./metrics.md) section.
diff --git a/schema/iguana-owl.png b/schema/iguana-owl.png
diff --git a/schema/iguana-result-schema.png b/schema/iguana-result-schema.png
diff --git a/schema/iguana.owx b/schema/iguana.owx
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <Ontology xmlns="http://www.w3.org/2002/07/owl#"
-     xml:base="https://iguana-benchmark.eu/ontology/"
+     xml:base="https://vocab.dice-research.org/iguana/"
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns:xml="http://www.w3.org/XML/1998/namespace"
      xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
      xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-     ontologyIRI="https://iguana-benchmark.eu/ontology/"
-     versionIRI="https://iguana-benchmark.eu/ontology/4.1.0/">
+     ontologyIRI="https://vocab.dice-research.org/iguana/"
+     versionIRI="https://vocab.dice-research.org/iguana/4.1.0/">
     <Prefix name="dc" IRI="http://purl.org/dc/elements/1.1/"/>
     <Prefix name="owl" IRI="http://www.w3.org/2002/07/owl#"/>
     <Prefix name="rdf" IRI="http://www.w3.org/1999/02/22-rdf-syntax-ns#"/>
     <Prefix name="xml" IRI="http://www.w3.org/XML/1998/namespace"/>
     <Prefix name="xsd" IRI="http://www.w3.org/2001/XMLSchema#"/>
-    <Prefix name="iont" IRI="https://iguana-benchmark.eu/ontology/class/"/>
-    <Prefix name="ires" IRI="https://iguana-benchmark.eu/ontology/resource/"/>
+    <Prefix name="iont" IRI="https://vocab.dice-research.org/iguana/class/"/>
+    <Prefix name="ires" IRI="https://vocab.dice-research.org/iguana/resource/"/>
     <Prefix name="rdfs" IRI="http://www.w3.org/2000/01/rdf-schema#"/>
-    <Prefix name="iprop" IRI="https://iguana-benchmark.eu/ontology/properties/"/>
+    <Prefix name="iprop" IRI="https://vocab.dice-research.org/iguana/properties/"/>
     <Prefix name="dcterms" IRI="http://purl.org/dc/terms/"/>
     <Import>http://purl.org/dc/elements/1.1/</Import>
     <Import>http://purl.org/dc/terms/</Import>
@@ -842,92 +842,92 @@
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:comment"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/AES</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/AES</IRI>
         <Literal xml:lang="en">Aggregated Execution Statistics.</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:label"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/AES</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/AES</IRI>
         <Literal>AES Metric</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:comment"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/AvgQPS</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/AvgQPS</IRI>
         <Literal xml:lang="en">Average Queries Per Second.</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:label"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/AvgQPS</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/AvgQPS</IRI>
         <Literal>AvgQPS Metric</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:comment"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/EachQuery</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/EachQuery</IRI>
         <Literal xml:lang="en">Each query execution statistics.</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:label"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/EachQuery</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/EachQuery</IRI>
         <Literal>EachQuery Metric</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:comment"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/NoQ</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/NoQ</IRI>
         <Literal xml:lang="en">Number of successfully executed Queries.</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:label"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/NoQ</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/NoQ</IRI>
         <Literal>NoQ Metric</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:comment"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/NoQPH</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/NoQPH</IRI>
         <Literal xml:lang="en">Number of Queries Per Hour.</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:label"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/NoQPH</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/NoQPH</IRI>
         <Literal>NoQPH Metric</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:comment"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/PAvgQPS</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/PAvgQPS</IRI>
         <Literal xml:lang="en">Penalized Average Queries Per Second.</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:label"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/PAvgQPS</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/PAvgQPS</IRI>
         <Literal>PAvgQPS Metric</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:comment"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/PQPS</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/PQPS</IRI>
         <Literal xml:lang="en">Penalized Queries Per Second.</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:label"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/PQPS</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/PQPS</IRI>
         <Literal>PQPS Metric</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:comment"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/QMPH</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/QMPH</IRI>
         <Literal xml:lang="en">Query Mixes Per Hour.</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:label"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/QMPH</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/QMPH</IRI>
         <Literal>QMPH Metric</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:comment"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/QPS</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/QPS</IRI>
         <Literal xml:lang="en">Queries Per Second Metric.</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>
         <AnnotationProperty abbreviatedIRI="rdfs:label"/>
-        <IRI>http://iguana-benchmark.eu/class/metric/QPS</IRI>
+        <IRI> https://vocab.dice-research.org/iguana/class/metric/QPS</IRI>
         <Literal>QPS Metric</Literal>
     </AnnotationAssertion>
     <AnnotationAssertion>

diff --git a/src/main/java/org/aksw/iguana/commons/rdf/IGUANA_BASE.java b/src/main/java/org/aksw/iguana/commons/rdf/IGUANA_BASE.java
@@ -3,7 +3,7 @@
 import java.util.Map;
 
 public class IGUANA_BASE {
-    public static final String NS = "http://iguana-benchmark.eu" + "/";
+    public static final String NS = "https://vocab.dice-research.org/iguana/";
     public static final String PREFIX = "iguana";
 
     private IGUANA_BASE() {

diff --git a/src/test/resources/cli/echoinput.sh b/src/test/resources/cli/echoinput.sh
diff --git a/src/test/resources/complex-script-example-issue108.sh b/src/test/resources/complex-script-example-issue108.sh
diff --git a/src/test/resources/config/mockupworkflow-default.yml b/src/test/resources/config/mockupworkflow-default.yml
diff --git a/src/test/resources/config/mockupworkflow-no-default.yml b/src/test/resources/config/mockupworkflow-no-default.yml