Skip to content

Commit

Permalink
Feature/add fdo types (#91)
Browse files Browse the repository at this point in the history 
* source system profile

* Add examples, remove allof keyword

* update readme

* code review

* add orchestration objets

* docker

* code reivew

* docker
  • Loading branch information
@southeo
southeo authored May 24, 2024
1 parent d6c2b44 commit 41ace18
Show file tree
Hide file tree
Showing 32 changed files with 322 additions and 52 deletions.
13 changes: 9 additions & 4 deletions data-model/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,13 @@ COPY ./fdo-profiles/0.1.0/tettris-service/schema/ schema-root/schemas/fdo-profil
COPY ./fdo-profiles/0.1.0/tombstone/schema/ schema-root/schemas/fdo-profiles/0.1.0/
COPY ./fdo-profiles/0.1.0/virtual-collections/schema/ schema-root/schemas/fdo-profiles/0.1.0/

COPY digitalobjects/0.1.0/digital-specimens/schema schema-root/schemas/digitalobjects/0.1.0/digital-specimens
COPY digitalobjects/0.1.0/shared-models/schema schema-root/schemas/digitalobjects/0.1.0/shared-models
COPY digitalobjects/0.1.0/digital-media-objects/schema schema-root/schemas/digitalobjects/0.1.0/digital-media-objects
COPY ./annotations/0.1.0/schema/annotation.json schema-root/schemas/fdo-types/0.1.0/annotation.json
COPY ./fdo-types/0.1.0/digital-specimens/schema schema-root/schemas/fdo-types/0.1.0/digital-specimens
COPY ./fdo-types/0.1.0/shared-models/schema schema-root/schemas/fdo-types/0.1.0/shared-models
COPY ./fdo-types/0.1.0/digital-media-objects/schema schema-root/schemas/fdo-types/0.1.0/digital-media-objects
COPY ./fdo-types/0.1.0/machine-annotation-services/schema schema-root/schemas/fdo-types/0.1.0/machine-annotation-services
COPY ./fdo-types/0.1.0/mappings/schema schema-root/schemas/fdo-types/0.1.0/mappings
COPY ./fdo-types/0.1.0/source-systems/schema schema-root/schemas/fdo-types/0.1.0/source-systems
COPY ./fdo-types/0.1.0/virtual-collections/schema schema-root/schemas/fdo-types/0.1.0/vitual-collections

COPY digitalobjects/0.2.0/digital-specimens/schema schema-root/schemas/digitalobjects/0.2.0/digital-specimens
COPY ./fdo-types/0.2.0/digital-specimens/schema schema-root/schemas/digitalobjects/0.2.0/digital-specimens
2 changes: 1 addition & 1 deletion data-model/annotations/0.1.0/schema/annotation.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://schemas.dissco.tech/schemas/annotations/0.1.0/annotation.json",
"$id": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/annotation.json",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$comment": "Annotation Version 0.1.0",
"title": "Annotation",
Expand Down
0 ...jects/examples/example-digital-media.json → ...jects/examples/example-digital-media.json
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions ...-media-objects/schema/digital-entity.json → ...-media-objects/schema/digital-entity.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-media-objects/digital-entity.json",
"$id": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-media-objects/digital-entity.json",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$comment":"DigitalObject Version 0.1.0",
"type": "object",
Expand Down Expand Up @@ -137,31 +137,31 @@
"assertions": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/assertions.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/assertions.json"
}
},
"citations": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/citations.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/citations.json"
}
},
"identifiers": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/identifiers.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/identifiers.json"
}
},
"entityRelationships": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/entity-relationships.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/entity-relationships.json"
}
},
"agents": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/agent.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/agent.json"
}
}
},
Expand Down
0 ...l-specimens/examples/example-mineral.json → ...l-specimens/examples/example-mineral.json
View file
File renamed without changes.
0 ...ens/examples/example-multiple-fossil.json → ...ens/examples/example-multiple-fossil.json
View file
File renamed without changes.
0 ...-specimens/examples/example-specimen.json → ...-specimens/examples/example-specimen.json
View file
File renamed without changes.
0 ...lobjects/0.1.0/digital-specimens/intro.md → ...do-types/0.1.0/digital-specimens/intro.md
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...al-specimens/schema/chronometric-age.json → ...al-specimens/schema/chronometric-age.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/chronometric-age.json",
"$id": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/chronometric-age.json",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$comment":"DigitalObject Version 0.1.0",
"type": "object",
Expand Down
20 changes: 10 additions & 10 deletions ...al-specimens/schema/digital-specimen.json → ...al-specimens/schema/digital-specimen.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/digital-specimen.json",
"$id": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/digital-specimen.json",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$comment":"DigitalObject Version 0.1.0",
"type": "object",
Expand Down Expand Up @@ -269,55 +269,55 @@
"materialEntity": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/material-entity.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/material-entity.json"
}
},
"dwc:identification": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/identifications.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/identifications.json"
}
},
"assertions": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/assertions.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/assertions.json"
}
},
"occurrences": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/occurrences.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/occurrences.json"
}
},
"entityRelationships": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/entity-relationships.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/entity-relationships.json"
}
},
"citations": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/citations.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/citations.json"
}
},
"identifiers": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/identifiers.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/identifiers.json"
}
},
"chronometricAge": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/chronometric-age.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/chronometric-age.json"
}
},
"agents": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/agent.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/agent.json"
}
}
},
Expand Down
6 changes: 3 additions & 3 deletions ....1.0/digital-specimens/schema/events.json → ....1.0/digital-specimens/schema/events.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/events.json",
"$id": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/events.json",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$comment": "DigitalObject Version 0.1.0",
"type": "object",
Expand Down Expand Up @@ -96,12 +96,12 @@
"$comment": "Not part of DWC or the UM?"
},
"location": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/location.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/location.json"
},
"agents": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/agent.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/agent.json"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...tal-specimens/schema/identifications.json → ...tal-specimens/schema/identifications.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/identifications.json",
"$id": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/identifications.json",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$comment": "DigitalObject Version 0.1.0",
"type": "object",
Expand Down Expand Up @@ -96,13 +96,13 @@
"citations": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/citations.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/citations.json"
}
},
"agents": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/agent.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/agent.json"
}
},
"taxonIdentifications": {
Expand Down
4 changes: 2 additions & 2 deletions ....0/digital-specimens/schema/location.json → ....0/digital-specimens/schema/location.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/location.json",
"$id": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/location.json",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$comment":"DigitalObject Version 0.1.0",
"type": "object",
Expand Down Expand Up @@ -258,7 +258,7 @@
"agents": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/agent.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/agent.json"
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions ...tal-specimens/schema/material-entity.json → ...tal-specimens/schema/material-entity.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/material-entity.json",
"$id": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/material-entity.json",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$comment":"DigitalObject Version 0.1.0",
"type": "object",
Expand Down Expand Up @@ -84,43 +84,43 @@
"identifications": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/identifications.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/identifications.json"
}
},
"assertions": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/assertions.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/assertions.json"
}
},
"entityRelationships": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/entity-relationships.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/entity-relationships.json"
}
},
"citations": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/citations.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/citations.json"
}
},
"identifiers": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/identifiers.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/identifiers.json"
}
},
"events": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/events.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/events.json"
}
},
"agents": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/agent.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/agent.json"
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...digital-specimens/schema/occurrences.json → ...digital-specimens/schema/occurrences.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$id": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/occurrences.json",
"$id": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/occurrences.json",
"$schema": "https://json-schema.org/draft/2020-12/schema",
"$comment":"DigitalObject Version 0.1.0",
"type": "object",
Expand Down Expand Up @@ -238,11 +238,11 @@
"assertions": {
"type": "array",
"items": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/shared-models/assertions.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/shared-models/assertions.json"
}
},
"location": {
"$ref": "https://schemas.dissco.tech/schemas/digitalobjects/0.1.0/digital-specimens/location.json"
"$ref": "https://schemas.dissco.tech/schemas/fdo-types/0.1.0/digital-specimens/location.json"
}
}
}
Loading

0 comments on commit 41ace18

Please sign in to comment.