Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(api-v1): Change API v1 file uploads to work like API v2 (PR 2) #1667

Closed
wants to merge 110 commits into from

Conversation

benjamingeer
Copy link

@benjamingeer benjamingeer commented Jun 30, 2020

Moved to #1722

This PR changes API v1 so that Knora and Sipi no longer need to share a filesystem (#535).

  • Change API v1 to use the same Sipi scripts as API v2.
  • Remove the API v1 Sipi scripts.
  • Change salsah1 to use upload.lua, sending it a JWT token.
  • Once Implement upload of text files in API v2 #1532 is done, fix KnoraSipiIntegrationV1ITSpec to use API v2 to create the XSLTransformation resource.
  • Update other API v1 tests.
  • Update API v1 docs.
  • Update release notes.

Moved from #1233.

Needs #1532.
Resolves #535.

Benjamin Geer added 30 commits February 28, 2019 17:15
# Conflicts:
#	webapi/src/it/scala/org/knora/webapi/e2e/v1/KnoraSipiIntegrationV1ITSpec.scala
# Conflicts:
#	webapi/src/it/scala/org/knora/webapi/e2e/v1/KnoraSipiIntegrationV1ITSpec.scala
# Conflicts:
#	docs/src/paradox/00-release-notes/next.md
#	webapi/src/main/scala/org/knora/webapi/messages/v1/responder/valuemessages/ValueMessagesV1.scala
#	webapi/src/main/scala/org/knora/webapi/responders/v1/ValuesResponderV1.scala
# Conflicts:
#	webapi/src/main/scala/org/knora/webapi/messages/v1/responder/valuemessages/ValueMessagesV1.scala
Benjamin Geer and others added 24 commits December 17, 2019 14:40
# Conflicts:
#	webapi/src/it/scala/org/knora/webapi/e2e/v1/KnoraSipiIntegrationV1ITSpec.scala
#	webapi/src/main/scala/org/knora/webapi/messages/store/sipimessages/SipiMessages.scala
#	webapi/src/main/scala/org/knora/webapi/messages/v1/responder/resourcemessages/ResourceMessagesV1.scala
#	webapi/src/main/scala/org/knora/webapi/messages/v1/responder/valuemessages/ValueMessagesV1.scala
#	webapi/src/main/scala/org/knora/webapi/routing/v1/ValuesRouteV1.scala
#	webapi/src/main/scala/org/knora/webapi/store/iiif/SipiConnector.scala
# Conflicts:
#	webapi/src/main/scala/org/knora/webapi/util/StringFormatter.scala
# Conflicts:
#	webapi/src/main/scala/org/knora/webapi/routing/v1/ValuesRouteV1.scala
# Conflicts:
#	webapi/src/it/scala/org/knora/webapi/ITKnoraLiveSpec.scala
#	webapi/src/main/scala/org/knora/webapi/routing/v1/ValuesRouteV1.scala
#	webapi/src/main/scala/org/knora/webapi/store/iiif/SipiConnector.scala
#	webapi/src/main/scala/org/knora/webapi/util/StringFormatter.scala
#	webapi/src/test/scala/org/knora/webapi/store/iiif/MockSipiConnector.scala
# Conflicts:
#	sipi/scripts/convert_from_file.lua
#	vars.mk
#	webapi/src/it/scala/org/knora/webapi/e2e/v1/KnoraSipiIntegrationV1ITSpec.scala
#	webapi/src/it/scala/org/knora/webapi/e2e/v1/KnoraSipiScriptsV1ITSpec.scala
#	webapi/src/it/scala/org/knora/webapi/e2e/v2/KnoraSipiIntegrationV2ITSpec.scala
#	webapi/src/it/scala/org/knora/webapi/other/v1/DrawingsGodsV1ITSpec.scala
# Conflicts:
#	docker/knora-sipi.template.dockerfile
#	project/Dependencies.scala
#	sipi/docker-compose.yml
#	sipi/scripts/make_thumbnail.lua
#	vars.mk
#	webapi/src/it/scala/org/knora/webapi/e2e/v1/KnoraSipiScriptsV1ITSpec.scala
#	webapi/src/it/scala/org/knora/webapi/e2e/v2/KnoraSipiIntegrationV2ITSpec.scala
#	webapi/src/main/scala/org/knora/webapi/responders/v1/ValueUtilV1.scala
@benjamingeer benjamingeer self-assigned this Jun 30, 2020
@benjamingeer benjamingeer marked this pull request as draft June 30, 2020 06:46
benjamingeer pushed a commit that referenced this pull request Sep 30, 2020
@benjamingeer benjamingeer deleted the wip/535-sipi branch October 1, 2020 12:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Don't require Knora and Sipi to share a directory for image upload
2 participants