diff --git a/.gitignore b/.gitignore index bfe3baa..7d1df62 100755 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ src/work/* sbol-validator/* *.bat src/DEPLOY_SECRET -.DS_Store \ No newline at end of file +.DS_Store +.venv diff --git a/README.md b/README.md index 91daa79..edc156d 100755 --- a/README.md +++ b/README.md @@ -1,10 +1,13 @@ # SBOL Validator [](https://travis-ci.org/SynBioDex/SBOL-Validator) -A web-based validator for SBOL files backed by libSBOLj's validation runtimes. This validator offers support for SBOL2, SBOL1.1, and GenBank. +A web-based validator for SBOL files backed by the [SBOL-Converter](https://github.com/SynBioDex/SBOL-Converter), which bundles libSBOLj (SBOL2) and libSBOLj3 (SBOL3). This validator offers support for SBOL3, SBOL2, SBOL1.1, GenBank, FASTA, and GFF3, including conversion between them. Furthermore, it is accessible through a web GUI or a RESTful API. The validator can be found [here](https://validator.sbolstandard.org) with an API endpoint found at `https://validator.sbolstandard.org/validate`. +### Validation engine +The backend shells out to `src/sbol-converter.jar`, the `jar-with-dependencies` build of the [SBOL-Converter](https://github.com/SynBioDex/SBOL-Converter) (which bundles libSBOLj and libSBOLj3). To update it, download the latest `sbol-converter-*-jar-with-dependencies.jar` asset from the [SBOL-Converter releases](https://github.com/SynBioDex/SBOL-Converter/releases) and replace `src/sbol-converter.jar`. A Java 21+ runtime is required. + ### Installation First, bit about the way the application is structured. There are two main parts: diff --git a/docker/converter.Dockerfile b/docker/converter.Dockerfile index 21f543a..e8216c3 100644 --- a/docker/converter.Dockerfile +++ b/docker/converter.Dockerfile @@ -1,6 +1,6 @@ FROM python:3.9-alpine -RUN apk add nginx openjdk17-jre python3-dev build-base linux-headers pcre-dev bash +RUN apk add nginx openjdk21-jre python3-dev build-base linux-headers pcre-dev bash WORKDIR /opt/SBOL-Validator diff --git a/docker/validator.Dockerfile b/docker/validator.Dockerfile index 9aec9f1..3541cec 100644 --- a/docker/validator.Dockerfile +++ b/docker/validator.Dockerfile @@ -1,6 +1,6 @@ FROM python:3.9-alpine -RUN apk add nginx openjdk17-jre python3-dev build-base linux-headers pcre-dev bash +RUN apk add nginx openjdk21-jre python3-dev build-base linux-headers pcre-dev bash WORKDIR /opt/SBOL-Validator diff --git a/src/conversion-form/html/form.html b/src/conversion-form/html/form.html index 4d443c6..72d9923 100755 --- a/src/conversion-form/html/form.html +++ b/src/conversion-form/html/form.html @@ -71,16 +71,13 @@