Skip to content

Commit

Permalink
change default port to 80 for http
Browse files Browse the repository at this point in the history
  • Loading branch information
CunliangGeng committed Jun 9, 2020
1 parent d43ce08 commit 90fa843
Show file tree
Hide file tree
Showing 51 changed files with 189 additions and 202 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ WORKDIR /home/fdp
RUN pip install .

ENV HOST=0.0.0.0
ENV PORT=8080
ENV PORT=80

CMD fdp-run ${HOST} ${PORT}
HEALTHCHECK --interval=5s CMD curl --silent --fail ${HOST}:${PORT} || exit 1
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ test:
pytest

serve-dev:
fdp-run localhost 8080
fdp-run localhost 80

clean: clean-build clean-pyc clean-test

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ pip install .

## Running
```bash
fdp-run localhost 8080
fdp-run localhost 80
```

Then visit from your browser: http://localhost:8080/
Then visit from your browser: http://localhost:80/

## Unit testing
Run tests (including coverage) with:
Expand Down Expand Up @@ -67,7 +67,7 @@ Before deploying FDP, it's necessary to first have a running SPARQL database.
pip install fairdatapoint
# fdp-run <host> <port> --db=<sparql-endpoint>
fdp example.com 8080 --db='http://dbpedia.org/sparql'
fdp example.com 80 --db='http://dbpedia.org/sparql'
```

## Web API documentation
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ version: '3'
services:
fdp:
image: "nlesc/fairdatapoint"
command: fdp-run HOSTNAME 8080 --db http://db:8890/sparql
command: fdp-run HOSTNAME 80 --db http://db:8890/sparql
ports:
- "8080:8080"
- "80:80"
depends_on:
- db
db:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ version: '3'
services:
fdp:
build: .
command: fdp-run 0.0.0.0 8080 --db http://db:8890/sparql
command: fdp-run 0.0.0.0 80 --db http://db:8890/sparql
ports:
- "8080:8080"
- "80:80"
healthcheck:
test: curl --silent --fail http://0.0.0.0:8080 || exit 1
test: curl --silent --fail http://0.0.0.0:80 || exit 1
interval: 5s
depends_on:
- db
Expand Down
4 changes: 2 additions & 2 deletions tests/data/catalog01.jsonld
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"@id": "http://0.0.0.0:8080/catalog/catalog01",
"@id": "http://0.0.0.0:80/catalog/catalog01",
"@type": [
"http://www.w3.org/ns/dcat#Catalog"
],
Expand All @@ -11,7 +11,7 @@
],
"http://purl.org/dc/terms/isPartOf": [
{
"@id": "http://0.0.0.0:8080/fdp"
"@id": "http://0.0.0.0:80/fdp"
}
],
"http://purl.org/dc/terms/publisher": [
Expand Down
5 changes: 2 additions & 3 deletions tests/data/catalog01.n3
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@
@prefix xml: <http://www.w3.org/XML/1998/namespace> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

<http://0.0.0.0:8080/catalog/catalog01> a dcat:Catalog ;
<http://0.0.0.0:80/catalog/catalog01> a dcat:Catalog ;
dcterms:hasVersion "1.0" ;
dcterms:isPartOf <http://0.0.0.0:8080/fdp> ;
dcterms:isPartOf <http://0.0.0.0:80/fdp> ;
dcterms:publisher <http://orcid.org/0000-0002-4368-8058> ;
dcterms:title "First sample catalog" ;
fdp:metadataIdentifier <http://example.org/catalog01> ;
fdp:metadataIssued "2016-10-27T00:00:00"^^xsd:dateTime ;
fdp:metadataModified "2016-10-27T00:00:00"^^xsd:dateTime ;
dcat:dataset <file:///Users/clgeng/teamflow/FAIRDataPoint/tests/data/dataset/breedb> ;
dcat:themeTaxonomy dbp:Breeding .

21 changes: 10 additions & 11 deletions tests/data/catalog01.nt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<http://0.0.0.0:8080/catalog/catalog01> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataIdentifier> <http://example.org/catalog01> .
<http://0.0.0.0:8080/catalog/catalog01> <http://purl.org/dc/terms/hasVersion> "1.0" .
<http://0.0.0.0:8080/catalog/catalog01> <http://www.w3.org/ns/dcat#dataset> <file:///Users/clgeng/teamflow/FAIRDataPoint/tests/data/dataset/breedb> .
<http://0.0.0.0:8080/catalog/catalog01> <http://www.w3.org/ns/dcat#themeTaxonomy> <http://dbpedia.org/resource/Breeding> .
<http://0.0.0.0:8080/catalog/catalog01> <http://purl.org/dc/terms/isPartOf> <http://0.0.0.0:8080/fdp> .
<http://0.0.0.0:8080/catalog/catalog01> <http://purl.org/dc/terms/publisher> <http://orcid.org/0000-0002-4368-8058> .
<http://0.0.0.0:8080/catalog/catalog01> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataModified> "2016-10-27T00:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
<http://0.0.0.0:8080/catalog/catalog01> <http://purl.org/dc/terms/title> "First sample catalog" .
<http://0.0.0.0:8080/catalog/catalog01> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/dcat#Catalog> .
<http://0.0.0.0:8080/catalog/catalog01> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataIssued> "2016-10-27T00:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .

<http://0.0.0.0:80/catalog/catalog01> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataIdentifier> <http://example.org/catalog01> .
<http://0.0.0.0:80/catalog/catalog01> <http://purl.org/dc/terms/hasVersion> "1.0" .
<http://0.0.0.0:80/catalog/catalog01> <http://www.w3.org/ns/dcat#dataset> <file:///Users/clgeng/teamflow/FAIRDataPoint/tests/data/dataset/breedb> .
<http://0.0.0.0:80/catalog/catalog01> <http://www.w3.org/ns/dcat#themeTaxonomy> <http://dbpedia.org/resource/Breeding> .
<http://0.0.0.0:80/catalog/catalog01> <http://purl.org/dc/terms/isPartOf> <http://0.0.0.0:80/fdp> .
<http://0.0.0.0:80/catalog/catalog01> <http://purl.org/dc/terms/publisher> <http://orcid.org/0000-0002-4368-8058> .
<http://0.0.0.0:80/catalog/catalog01> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataModified> "2016-10-27T00:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
<http://0.0.0.0:80/catalog/catalog01> <http://purl.org/dc/terms/title> "First sample catalog" .
<http://0.0.0.0:80/catalog/catalog01> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/dcat#Catalog> .
<http://0.0.0.0:80/catalog/catalog01> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataIssued> "2016-10-27T00:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
4 changes: 2 additions & 2 deletions tests/data/catalog01.rdf
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
xmlns:fdp="http://rdf.biosemantics.org/ontologies/fdp-o#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
>
<rdf:Description rdf:about="http://0.0.0.0:8080/catalog/catalog01">
<rdf:Description rdf:about="http://0.0.0.0:80/catalog/catalog01">
<dcterms:publisher rdf:resource="http://orcid.org/0000-0002-4368-8058"/>
<fdp:metadataIdentifier rdf:resource="http://example.org/catalog01"/>
<dcterms:isPartOf rdf:resource="http://0.0.0.0:8080/fdp"/>
<dcterms:isPartOf rdf:resource="http://0.0.0.0:80/fdp"/>
<dcat:dataset rdf:resource="file:///Users/clgeng/teamflow/FAIRDataPoint/tests/data/dataset/breedb"/>
<fdp:metadataModified rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2016-10-27T00:00:00</fdp:metadataModified>
<dcat:themeTaxonomy rdf:resource="http://dbpedia.org/resource/Breeding"/>
Expand Down
4 changes: 2 additions & 2 deletions tests/data/catalog01.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
@prefix fdp: <http://rdf.biosemantics.org/ontologies/fdp-o#> .
@prefix dbp: <http://dbpedia.org/resource/> .

<http://0.0.0.0:8080/catalog/catalog01> a dcat:Catalog ;
<http://0.0.0.0:80/catalog/catalog01> a dcat:Catalog ;
dcterms:title "First sample catalog";
dcterms:hasVersion "1.0" ;
dcterms:publisher <http://orcid.org/0000-0002-4368-8058> ;
dcterms:isPartOf <http://0.0.0.0:8080/fdp> ;
dcterms:isPartOf <http://0.0.0.0:80/fdp> ;
fdp:metadataIdentifier <http://example.org/catalog01> ;
fdp:metadataIssued "2016-10-27T00:00:00"^^xsd:dateTime ;
fdp:metadataModified "2016-10-27T00:00:00"^^xsd:dateTime ;
Expand Down
2 changes: 1 addition & 1 deletion tests/data/catalog01_invalid_missingRequired.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
@prefix fdp: <http://rdf.biosemantics.org/ontologies/fdp-o#> .
@prefix dbp: <http://dbpedia.org/resource/> .

<http://0.0.0.0:8080/catalog/catalog01> a dcat:Catalog .
<http://0.0.0.0:80/catalog/catalog01> a dcat:Catalog .
6 changes: 3 additions & 3 deletions tests/data/catalog02.jsonld
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"@id": "http://0.0.0.0:8080/catalog/catalog02",
"@id": "http://0.0.0.0:80/catalog/catalog02",
"@type": [
"http://www.w3.org/ns/dcat#Catalog"
],
Expand All @@ -11,7 +11,7 @@
],
"http://purl.org/dc/terms/isPartOf": [
{
"@id": "http://0.0.0.0:8080/fdp"
"@id": "http://0.0.0.0:80/fdp"
}
],
"http://purl.org/dc/terms/publisher": [
Expand Down Expand Up @@ -43,7 +43,7 @@
],
"http://www.w3.org/ns/dcat#dataset": [
{
"@id": "http://0.0.0.0:8080/dataset/dataset02"
"@id": "http://0.0.0.0:80/dataset/dataset02"
}
],
"http://www.w3.org/ns/dcat#themeTaxonomy": [
Expand Down
7 changes: 3 additions & 4 deletions tests/data/catalog02.n3
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@
@prefix xml: <http://www.w3.org/XML/1998/namespace> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

<http://0.0.0.0:8080/catalog/catalog02> a dcat:Catalog ;
<http://0.0.0.0:80/catalog/catalog02> a dcat:Catalog ;
dcterms:hasVersion "1.1" ;
dcterms:isPartOf <http://0.0.0.0:8080/fdp> ;
dcterms:isPartOf <http://0.0.0.0:80/fdp> ;
dcterms:publisher <http://orcid.org/0000-0002-4368-8058> ;
dcterms:title "Second sample catalog" ;
fdp:metadataIdentifier <http://example.org/catalog02> ;
fdp:metadataIssued "2016-10-27T09:30:00"^^xsd:dateTime ;
fdp:metadataModified "2016-12-23T10:00:00"^^xsd:dateTime ;
dcat:dataset <http://0.0.0.0:8080/dataset/dataset02> ;
dcat:dataset <http://0.0.0.0:80/dataset/dataset02> ;
dcat:themeTaxonomy dbp:Breeding .

21 changes: 10 additions & 11 deletions tests/data/catalog02.nt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<http://0.0.0.0:8080/catalog/catalog02> <http://purl.org/dc/terms/publisher> <http://orcid.org/0000-0002-4368-8058> .
<http://0.0.0.0:8080/catalog/catalog02> <http://purl.org/dc/terms/hasVersion> "1.1" .
<http://0.0.0.0:8080/catalog/catalog02> <http://purl.org/dc/terms/title> "Second sample catalog" .
<http://0.0.0.0:8080/catalog/catalog02> <http://www.w3.org/ns/dcat#dataset> <http://0.0.0.0:8080/dataset/dataset02> .
<http://0.0.0.0:8080/catalog/catalog02> <http://www.w3.org/ns/dcat#themeTaxonomy> <http://dbpedia.org/resource/Breeding> .
<http://0.0.0.0:8080/catalog/catalog02> <http://purl.org/dc/terms/isPartOf> <http://0.0.0.0:8080/fdp> .
<http://0.0.0.0:8080/catalog/catalog02> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataModified> "2016-12-23T10:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
<http://0.0.0.0:8080/catalog/catalog02> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataIdentifier> <http://example.org/catalog02> .
<http://0.0.0.0:8080/catalog/catalog02> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataIssued> "2016-10-27T09:30:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
<http://0.0.0.0:8080/catalog/catalog02> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/dcat#Catalog> .

<http://0.0.0.0:80/catalog/catalog02> <http://purl.org/dc/terms/publisher> <http://orcid.org/0000-0002-4368-8058> .
<http://0.0.0.0:80/catalog/catalog02> <http://purl.org/dc/terms/hasVersion> "1.1" .
<http://0.0.0.0:80/catalog/catalog02> <http://purl.org/dc/terms/title> "Second sample catalog" .
<http://0.0.0.0:80/catalog/catalog02> <http://www.w3.org/ns/dcat#dataset> <http://0.0.0.0:80/dataset/dataset02> .
<http://0.0.0.0:80/catalog/catalog02> <http://www.w3.org/ns/dcat#themeTaxonomy> <http://dbpedia.org/resource/Breeding> .
<http://0.0.0.0:80/catalog/catalog02> <http://purl.org/dc/terms/isPartOf> <http://0.0.0.0:80/fdp> .
<http://0.0.0.0:80/catalog/catalog02> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataModified> "2016-12-23T10:00:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
<http://0.0.0.0:80/catalog/catalog02> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataIdentifier> <http://example.org/catalog02> .
<http://0.0.0.0:80/catalog/catalog02> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataIssued> "2016-10-27T09:30:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
<http://0.0.0.0:80/catalog/catalog02> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/dcat#Catalog> .
6 changes: 3 additions & 3 deletions tests/data/catalog02.rdf
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
xmlns:fdp="http://rdf.biosemantics.org/ontologies/fdp-o#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
>
<rdf:Description rdf:about="http://0.0.0.0:8080/catalog/catalog02">
<rdf:Description rdf:about="http://0.0.0.0:80/catalog/catalog02">
<dcterms:title>Second sample catalog</dcterms:title>
<fdp:metadataIdentifier rdf:resource="http://example.org/catalog02"/>
<dcterms:publisher rdf:resource="http://orcid.org/0000-0002-4368-8058"/>
<dcat:dataset rdf:resource="http://0.0.0.0:8080/dataset/dataset02"/>
<dcat:dataset rdf:resource="http://0.0.0.0:80/dataset/dataset02"/>
<dcat:themeTaxonomy rdf:resource="http://dbpedia.org/resource/Breeding"/>
<rdf:type rdf:resource="http://www.w3.org/ns/dcat#Catalog"/>
<fdp:metadataIssued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2016-10-27T09:30:00</fdp:metadataIssued>
<dcterms:isPartOf rdf:resource="http://0.0.0.0:8080/fdp"/>
<dcterms:isPartOf rdf:resource="http://0.0.0.0:80/fdp"/>
<fdp:metadataModified rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2016-12-23T10:00:00</fdp:metadataModified>
<dcterms:hasVersion>1.1</dcterms:hasVersion>
</rdf:Description>
Expand Down
6 changes: 3 additions & 3 deletions tests/data/catalog02.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
@prefix fdp: <http://rdf.biosemantics.org/ontologies/fdp-o#> .
@prefix dbp: <http://dbpedia.org/resource/> .

<http://0.0.0.0:8080/catalog/catalog02> a dcat:Catalog ;
<http://0.0.0.0:80/catalog/catalog02> a dcat:Catalog ;
dcterms:title "Second sample catalog" ;
dcterms:hasVersion "1.1" ;
dcterms:publisher <http://orcid.org/0000-0002-4368-8058> ;
dcterms:isPartOf <http://0.0.0.0:8080/fdp> ;
dcterms:isPartOf <http://0.0.0.0:80/fdp> ;
fdp:metadataIdentifier <http://example.org/catalog02> ;
fdp:metadataIssued "2016-10-27T09:30:00"^^xsd:dateTime ;
fdp:metadataModified "2016-12-23T10:00:00"^^xsd:dateTime ;
dcat:dataset <http://0.0.0.0:8080/dataset/dataset02> ;
dcat:dataset <http://0.0.0.0:80/dataset/dataset02> ;
dcat:themeTaxonomy dbp:Breeding .
6 changes: 3 additions & 3 deletions tests/data/dataset01.jsonld
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"@id": "http://0.0.0.0:8080/dataset/breedb",
"@id": "http://0.0.0.0:80/dataset/breedb",
"@type": [
"http://www.w3.org/ns/dcat#Dataset"
],
Expand All @@ -11,7 +11,7 @@
],
"http://purl.org/dc/terms/isPartOf": [
{
"@id": "http://0.0.0.0:8080/catalog/catalog01"
"@id": "http://0.0.0.0:80/catalog/catalog01"
}
],
"http://purl.org/dc/terms/publisher": [
Expand Down Expand Up @@ -43,7 +43,7 @@
],
"http://www.w3.org/ns/dcat#distribution": [
{
"@id": "http://0.0.0.0:8080/distribution/breedb-sparql"
"@id": "http://0.0.0.0:80/distribution/breedb-sparql"
}
],
"http://www.w3.org/ns/dcat#theme": [
Expand Down
7 changes: 3 additions & 4 deletions tests/data/dataset01.n3
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,13 @@
@prefix xml: <http://www.w3.org/XML/1998/namespace> .
@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .

<http://0.0.0.0:8080/dataset/breedb> a dcat:Dataset ;
<http://0.0.0.0:80/dataset/breedb> a dcat:Dataset ;
dcterms:hasVersion "1.0"^^xsd:string ;
dcterms:isPartOf <http://0.0.0.0:8080/catalog/catalog01> ;
dcterms:isPartOf <http://0.0.0.0:80/catalog/catalog01> ;
dcterms:publisher <http://orcid.org/0000-0002-4368-8058> ;
dcterms:title "BreeDB tomato passport dataset"^^xsd:string ;
fdp:metadataIdentifier <http://example.org/dataset01> ;
fdp:metadataIssued "2016-10-27T09:30:00"^^xsd:dateTime ;
fdp:metadataModified "2016-10-27T09:30:00"^^xsd:dateTime ;
dcat:distribution <http://0.0.0.0:8080/distribution/breedb-sparql> ;
dcat:distribution <http://0.0.0.0:80/distribution/breedb-sparql> ;
dcat:theme dbp:Plant_breeding .

21 changes: 10 additions & 11 deletions tests/data/dataset01.nt
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<http://0.0.0.0:8080/dataset/breedb> <http://purl.org/dc/terms/publisher> <http://orcid.org/0000-0002-4368-8058> .
<http://0.0.0.0:8080/dataset/breedb> <http://purl.org/dc/terms/title> "BreeDB tomato passport dataset"^^<http://www.w3.org/2001/XMLSchema#string> .
<http://0.0.0.0:8080/dataset/breedb> <http://purl.org/dc/terms/isPartOf> <http://0.0.0.0:8080/catalog/catalog01> .
<http://0.0.0.0:8080/dataset/breedb> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataModified> "2016-10-27T09:30:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
<http://0.0.0.0:8080/dataset/breedb> <http://www.w3.org/ns/dcat#distribution> <http://0.0.0.0:8080/distribution/breedb-sparql> .
<http://0.0.0.0:8080/dataset/breedb> <http://purl.org/dc/terms/hasVersion> "1.0"^^<http://www.w3.org/2001/XMLSchema#string> .
<http://0.0.0.0:8080/dataset/breedb> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataIssued> "2016-10-27T09:30:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
<http://0.0.0.0:8080/dataset/breedb> <http://www.w3.org/ns/dcat#theme> <http://dbpedia.org/resource/Plant_breeding> .
<http://0.0.0.0:8080/dataset/breedb> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/dcat#Dataset> .
<http://0.0.0.0:8080/dataset/breedb> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataIdentifier> <http://example.org/dataset01> .

<http://0.0.0.0:80/dataset/breedb> <http://purl.org/dc/terms/publisher> <http://orcid.org/0000-0002-4368-8058> .
<http://0.0.0.0:80/dataset/breedb> <http://purl.org/dc/terms/title> "BreeDB tomato passport dataset"^^<http://www.w3.org/2001/XMLSchema#string> .
<http://0.0.0.0:80/dataset/breedb> <http://purl.org/dc/terms/isPartOf> <http://0.0.0.0:80/catalog/catalog01> .
<http://0.0.0.0:80/dataset/breedb> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataModified> "2016-10-27T09:30:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
<http://0.0.0.0:80/dataset/breedb> <http://www.w3.org/ns/dcat#distribution> <http://0.0.0.0:80/distribution/breedb-sparql> .
<http://0.0.0.0:80/dataset/breedb> <http://purl.org/dc/terms/hasVersion> "1.0"^^<http://www.w3.org/2001/XMLSchema#string> .
<http://0.0.0.0:80/dataset/breedb> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataIssued> "2016-10-27T09:30:00"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
<http://0.0.0.0:80/dataset/breedb> <http://www.w3.org/ns/dcat#theme> <http://dbpedia.org/resource/Plant_breeding> .
<http://0.0.0.0:80/dataset/breedb> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/dcat#Dataset> .
<http://0.0.0.0:80/dataset/breedb> <http://rdf.biosemantics.org/ontologies/fdp-o#metadataIdentifier> <http://example.org/dataset01> .
6 changes: 3 additions & 3 deletions tests/data/dataset01.rdf
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
xmlns:fdp="http://rdf.biosemantics.org/ontologies/fdp-o#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
>
<rdf:Description rdf:about="http://0.0.0.0:8080/dataset/breedb">
<rdf:Description rdf:about="http://0.0.0.0:80/dataset/breedb">
<dcat:theme rdf:resource="http://dbpedia.org/resource/Plant_breeding"/>
<dcterms:title rdf:datatype="http://www.w3.org/2001/XMLSchema#string">BreeDB tomato passport dataset</dcterms:title>
<dcterms:hasVersion rdf:datatype="http://www.w3.org/2001/XMLSchema#string">1.0</dcterms:hasVersion>
<dcterms:publisher rdf:resource="http://orcid.org/0000-0002-4368-8058"/>
<dcterms:isPartOf rdf:resource="http://0.0.0.0:8080/catalog/catalog01"/>
<dcterms:isPartOf rdf:resource="http://0.0.0.0:80/catalog/catalog01"/>
<fdp:metadataIdentifier rdf:resource="http://example.org/dataset01"/>
<fdp:metadataModified rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2016-10-27T09:30:00</fdp:metadataModified>
<fdp:metadataIssued rdf:datatype="http://www.w3.org/2001/XMLSchema#dateTime">2016-10-27T09:30:00</fdp:metadataIssued>
<rdf:type rdf:resource="http://www.w3.org/ns/dcat#Dataset"/>
<dcat:distribution rdf:resource="http://0.0.0.0:8080/distribution/breedb-sparql"/>
<dcat:distribution rdf:resource="http://0.0.0.0:80/distribution/breedb-sparql"/>
</rdf:Description>
</rdf:RDF>
6 changes: 3 additions & 3 deletions tests/data/dataset01.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
@prefix fdp: <http://rdf.biosemantics.org/ontologies/fdp-o#> .
@prefix dbp: <http://dbpedia.org/resource/> .

<http://0.0.0.0:8080/dataset/breedb> a dcat:Dataset ;
<http://0.0.0.0:80/dataset/breedb> a dcat:Dataset ;
dcterms:title "BreeDB tomato passport dataset"^^xsd:string ;
dcterms:publisher <http://orcid.org/0000-0002-4368-8058> ;
dcterms:hasVersion "1.0"^^xsd:string ;
dcterms:isPartOf <http://0.0.0.0:8080/catalog/catalog01> ;
dcterms:isPartOf <http://0.0.0.0:80/catalog/catalog01> ;
fdp:metadataIdentifier <http://example.org/dataset01> ;
fdp:metadataIssued "2016-10-27T09:30:00"^^xsd:dateTime ;
fdp:metadataModified "2016-10-27T09:30:00"^^xsd:dateTime ;
dcat:distribution <http://0.0.0.0:8080/distribution/breedb-sparql> ;
dcat:distribution <http://0.0.0.0:80/distribution/breedb-sparql> ;
dcat:theme dbp:Plant_breeding .
2 changes: 1 addition & 1 deletion tests/data/dataset01_invalid_missingRequired.ttl
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
@prefix fdp: <http://rdf.biosemantics.org/ontologies/fdp-o#> .
@prefix dbp: <http://dbpedia.org/resource/> .

<http://0.0.0.0:8080/dataset/breedb> a dcat:Dataset .
<http://0.0.0.0:80/dataset/breedb> a dcat:Dataset .
Loading

0 comments on commit 90fa843

Please sign in to comment.