diff --git a/README.md b/README.md index 489751e6bc..b5e7bff4a1 100644 --- a/README.md +++ b/README.md @@ -92,22 +92,17 @@ See [docs/Readme.md](docs/Readme.md). ### Run the Knora API server With [Bazel](https://docs.bazel.build/versions/3.3.0/install-os-x.html) and -[Docker](https://www.docker.com) installed, run the following: - -``` -$ make stack-up -``` - -Then to create a test repository and load some test data into the triplestore: +[Docker](https://www.docker.com) installed, run the following to create a test +repository and load some test data into the triplestore: ``` $ make init-db-test ``` -Then we need to restart knora-api after loading the data: +Then we need to start knora-api after loading the data: ``` -$ make stack-restart-api +$ make stack-up ``` Then try opening [http://localhost:3333/v1/resources/http%3A%2F%2Frdfh.ch%2F0803%2Fc5058f3a](http://localhost:3333/v1/resources/http%3A%2F%2Frdfh.ch%2F0803%2Fc5058f3a) in a web browser. You should see a response in JSON describing a book. diff --git a/webapi/scripts/fuseki-init-knora-test-minimal.sh b/webapi/scripts/fuseki-init-knora-test-minimal.sh index f6e94cbe7b..c287e32efc 100755 --- a/webapi/scripts/fuseki-init-knora-test-minimal.sh +++ b/webapi/scripts/fuseki-init-knora-test-minimal.sh @@ -13,6 +13,6 @@ upload-graph ../../knora-ontologies/knora-base.ttl http://www.knora.org/ontology upload-graph ../../knora-ontologies/standoff-onto.ttl http://www.knora.org/ontology/standoff upload-graph ../../knora-ontologies/standoff-data.ttl http://www.knora.org/data/standoff upload-graph ../../knora-ontologies/salsah-gui.ttl http://www.knora.org/ontology/salsah-gui -upload-graph ../_test_data/all_data/admin-data.ttl http://www.knora.org/data/admin -upload-graph ../_test_data/all_data/permissions-data.ttl http://www.knora.org/data/permissions -upload-graph ../_test_data/all_data/system-data.ttl http://www.knora.org/data/0000/SystemProject +upload-graph ../../test_data/all_data/admin-data.ttl http://www.knora.org/data/admin +upload-graph ../../test_data/all_data/permissions-data.ttl http://www.knora.org/data/permissions +upload-graph ../../test_data/all_data/system-data.ttl http://www.knora.org/data/0000/SystemProject diff --git a/webapi/scripts/fuseki-init-knora-test-unit-minimal.sh b/webapi/scripts/fuseki-init-knora-test-unit-minimal.sh index faaa760364..5c022c4dd5 100755 --- a/webapi/scripts/fuseki-init-knora-test-unit-minimal.sh +++ b/webapi/scripts/fuseki-init-knora-test-unit-minimal.sh @@ -13,6 +13,6 @@ upload-graph ../../knora-ontologies/knora-base.ttl http://www.knora.org/ontology upload-graph ../../knora-ontologies/standoff-onto.ttl http://www.knora.org/ontology/standoff upload-graph ../../knora-ontologies/standoff-data.ttl http://www.knora.org/data/standoff upload-graph ../../knora-ontologies/salsah-gui.ttl http://www.knora.org/ontology/salsah-gui -upload-graph ../_test_data/all_data/admin-data.ttl http://www.knora.org/data/admin -upload-graph ../_test_data/all_data/permissions-data.ttl http://www.knora.org/data/permissions -upload-graph ../_test_data/all_data/system-data.ttl http://www.knora.org/data/0000/SystemProject +upload-graph ../../test_data/all_data/admin-data.ttl http://www.knora.org/data/admin +upload-graph ../../test_data/all_data/permissions-data.ttl http://www.knora.org/data/permissions +upload-graph ../../test_data/all_data/system-data.ttl http://www.knora.org/data/0000/SystemProject diff --git a/webapi/scripts/fuseki-init-knora-test-unit.sh b/webapi/scripts/fuseki-init-knora-test-unit.sh index d835f18adb..87596360b3 100755 --- a/webapi/scripts/fuseki-init-knora-test-unit.sh +++ b/webapi/scripts/fuseki-init-knora-test-unit.sh @@ -13,23 +13,23 @@ upload-graph ../../knora-ontologies/knora-base.ttl http://www.knora.org/ontology upload-graph ../../knora-ontologies/standoff-onto.ttl http://www.knora.org/ontology/standoff upload-graph ../../knora-ontologies/standoff-data.ttl http://www.knora.org/data/standoff upload-graph ../../knora-ontologies/salsah-gui.ttl http://www.knora.org/ontology/salsah-gui -upload-graph ../_test_data/all_data/admin-data.ttl http://www.knora.org/data/admin -upload-graph ../_test_data/all_data/permissions-data.ttl http://www.knora.org/data/permissions -upload-graph ../_test_data/all_data/system-data.ttl http://www.knora.org/data/0000/SystemProject -upload-graph ../_test_data/ontologies/incunabula-onto.ttl http://www.knora.org/ontology/0803/incunabula -upload-graph ../_test_data/all_data/incunabula-data.ttl http://www.knora.org/data/0803/incunabula -upload-graph ../_test_data/ontologies/dokubib-onto.ttl http://www.knora.org/ontology/0804/dokubib -upload-graph ../_test_data/ontologies/images-onto.ttl http://www.knora.org/ontology/00FF/images -upload-graph ../_test_data/demo_data/images-demo-data.ttl http://www.knora.org/data/00FF/images -upload-graph ../_test_data/ontologies/anything-onto.ttl http://www.knora.org/ontology/0001/anything -upload-graph ../_test_data/all_data/anything-data.ttl http://www.knora.org/data/0001/anything -upload-graph ../_test_data/ontologies/minimal-onto.ttl http://www.knora.org/ontology/0001/minimal -upload-graph ../_test_data/ontologies/something-onto.ttl http://www.knora.org/ontology/0001/something -upload-graph ../_test_data/ontologies/beol-onto.ttl http://www.knora.org/ontology/0801/beol -upload-graph ../_test_data/ontologies/biblio-onto.ttl http://www.knora.org/ontology/0801/biblio -upload-graph ../_test_data/ontologies/newton-onto.ttl http://www.knora.org/ontology/0801/newton -upload-graph ../_test_data/ontologies/leibniz-onto.ttl http://www.knora.org/ontology/0801/leibniz -upload-graph ../_test_data/all_data/biblio-data.ttl http://www.knora.org/data/0801/biblio -upload-graph ../_test_data/all_data/beol-data.ttl http://www.knora.org/data/0801/beol -upload-graph ../_test_data/ontologies/webern-onto.ttl http://www.knora.org/ontology/08AE/webern -upload-graph ../_test_data/all_data/webern-data.ttl http://www.knora.org/data/08AE/webern +upload-graph ../../test_data/all_data/admin-data.ttl http://www.knora.org/data/admin +upload-graph ../../test_data/all_data/permissions-data.ttl http://www.knora.org/data/permissions +upload-graph ../../test_data/all_data/system-data.ttl http://www.knora.org/data/0000/SystemProject +upload-graph ../../test_data/ontologies/incunabula-onto.ttl http://www.knora.org/ontology/0803/incunabula +upload-graph ../../test_data/all_data/incunabula-data.ttl http://www.knora.org/data/0803/incunabula +upload-graph ../../test_data/ontologies/dokubib-onto.ttl http://www.knora.org/ontology/0804/dokubib +upload-graph ../../test_data/ontologies/images-onto.ttl http://www.knora.org/ontology/00FF/images +upload-graph ../../test_data/demo_data/images-demo-data.ttl http://www.knora.org/data/00FF/images +upload-graph ../../test_data/ontologies/anything-onto.ttl http://www.knora.org/ontology/0001/anything +upload-graph ../../test_data/all_data/anything-data.ttl http://www.knora.org/data/0001/anything +upload-graph ../../test_data/ontologies/minimal-onto.ttl http://www.knora.org/ontology/0001/minimal +upload-graph ../../test_data/ontologies/something-onto.ttl http://www.knora.org/ontology/0001/something +upload-graph ../../test_data/ontologies/beol-onto.ttl http://www.knora.org/ontology/0801/beol +upload-graph ../../test_data/ontologies/biblio-onto.ttl http://www.knora.org/ontology/0801/biblio +upload-graph ../../test_data/ontologies/newton-onto.ttl http://www.knora.org/ontology/0801/newton +upload-graph ../../test_data/ontologies/leibniz-onto.ttl http://www.knora.org/ontology/0801/leibniz +upload-graph ../../test_data/all_data/biblio-data.ttl http://www.knora.org/data/0801/biblio +upload-graph ../../test_data/all_data/beol-data.ttl http://www.knora.org/data/0801/beol +upload-graph ../../test_data/ontologies/webern-onto.ttl http://www.knora.org/ontology/08AE/webern +upload-graph ../../test_data/all_data/webern-data.ttl http://www.knora.org/data/08AE/webern diff --git a/webapi/scripts/fuseki-init-knora-test.sh b/webapi/scripts/fuseki-init-knora-test.sh index 32e8929788..56439bf952 100755 --- a/webapi/scripts/fuseki-init-knora-test.sh +++ b/webapi/scripts/fuseki-init-knora-test.sh @@ -13,23 +13,23 @@ upload-graph ../../knora-ontologies/knora-base.ttl http://www.knora.org/ontology upload-graph ../../knora-ontologies/standoff-onto.ttl http://www.knora.org/ontology/standoff upload-graph ../../knora-ontologies/standoff-data.ttl http://www.knora.org/data/standoff upload-graph ../../knora-ontologies/salsah-gui.ttl http://www.knora.org/ontology/salsah-gui -upload-graph ../_test_data/all_data/admin-data.ttl http://www.knora.org/data/admin -upload-graph ../_test_data/all_data/permissions-data.ttl http://www.knora.org/data/permissions -upload-graph ../_test_data/all_data/system-data.ttl http://www.knora.org/data/0000/SystemProject -upload-graph ../_test_data/ontologies/incunabula-onto.ttl http://www.knora.org/ontology/0803/incunabula -upload-graph ../_test_data/all_data/incunabula-data.ttl http://www.knora.org/data/0803/incunabula -upload-graph ../_test_data/ontologies/dokubib-onto.ttl http://www.knora.org/ontology/0804/dokubib -upload-graph ../_test_data/ontologies/images-onto.ttl http://www.knora.org/ontology/00FF/images -upload-graph ../_test_data/demo_data/images-demo-data.ttl http://www.knora.org/data/00FF/images -upload-graph ../_test_data/ontologies/anything-onto.ttl http://www.knora.org/ontology/0001/anything -upload-graph ../_test_data/all_data/anything-data.ttl http://www.knora.org/data/0001/anything -upload-graph ../_test_data/ontologies/minimal-onto.ttl http://www.knora.org/ontology/0001/minimal -upload-graph ../_test_data/ontologies/something-onto.ttl http://www.knora.org/ontology/0001/something -upload-graph ../_test_data/ontologies/beol-onto.ttl http://www.knora.org/ontology/0801/beol -upload-graph ../_test_data/ontologies/biblio-onto.ttl http://www.knora.org/ontology/0801/biblio -upload-graph ../_test_data/ontologies/newton-onto.ttl http://www.knora.org/ontology/0801/newton -upload-graph ../_test_data/ontologies/leibniz-onto.ttl http://www.knora.org/ontology/0801/leibniz -upload-graph ../_test_data/all_data/biblio-data.ttl http://www.knora.org/data/0801/biblio -upload-graph ../_test_data/all_data/beol-data.ttl http://www.knora.org/data/0801/beol -upload-graph ../_test_data/ontologies/webern-onto.ttl http://www.knora.org/ontology/08AE/webern -upload-graph ../_test_data/all_data/webern-data.ttl http://www.knora.org/data/08AE/webern +upload-graph ../../test_data/all_data/admin-data.ttl http://www.knora.org/data/admin +upload-graph ../../test_data/all_data/permissions-data.ttl http://www.knora.org/data/permissions +upload-graph ../../test_data/all_data/system-data.ttl http://www.knora.org/data/0000/SystemProject +upload-graph ../../test_data/ontologies/incunabula-onto.ttl http://www.knora.org/ontology/0803/incunabula +upload-graph ../../test_data/all_data/incunabula-data.ttl http://www.knora.org/data/0803/incunabula +upload-graph ../../test_data/ontologies/dokubib-onto.ttl http://www.knora.org/ontology/0804/dokubib +upload-graph ../../test_data/ontologies/images-onto.ttl http://www.knora.org/ontology/00FF/images +upload-graph ../../test_data/demo_data/images-demo-data.ttl http://www.knora.org/data/00FF/images +upload-graph ../../test_data/ontologies/anything-onto.ttl http://www.knora.org/ontology/0001/anything +upload-graph ../../test_data/all_data/anything-data.ttl http://www.knora.org/data/0001/anything +upload-graph ../../test_data/ontologies/minimal-onto.ttl http://www.knora.org/ontology/0001/minimal +upload-graph ../../test_data/ontologies/something-onto.ttl http://www.knora.org/ontology/0001/something +upload-graph ../../test_data/ontologies/beol-onto.ttl http://www.knora.org/ontology/0801/beol +upload-graph ../../test_data/ontologies/biblio-onto.ttl http://www.knora.org/ontology/0801/biblio +upload-graph ../../test_data/ontologies/newton-onto.ttl http://www.knora.org/ontology/0801/newton +upload-graph ../../test_data/ontologies/leibniz-onto.ttl http://www.knora.org/ontology/0801/leibniz +upload-graph ../../test_data/all_data/biblio-data.ttl http://www.knora.org/data/0801/biblio +upload-graph ../../test_data/all_data/beol-data.ttl http://www.knora.org/data/0801/beol +upload-graph ../../test_data/ontologies/webern-onto.ttl http://www.knora.org/ontology/08AE/webern +upload-graph ../../test_data/all_data/webern-data.ttl http://www.knora.org/data/08AE/webern