Skip to content
Permalink
Browse files
refactor(triplestore): remove graphDB support (#2037)
* remove graphDB related scripts + clean docs

* remove consistency checking

* remove graphDB config

* refactor twirl templates related to graphDB

* remove embedded-jena-graphdb config

* refactor twirl templates related to graphDB in admin routes

* refactor twirl templates related to graphDB in v1 routes

* remove GraphDBAPI

* remove more graphDB inference related stuff

* update docs

* remove more graphDB stuff

* PR changes

* more PR changes

* chore: release 20.1.0 (#2036)

* commit to trigger bad gh actions

Co-authored-by: DaSCH Bot <50987250+daschbot@users.noreply.github.com>
  • Loading branch information
mpro7 and daschbot committed Apr 13, 2022
1 parent 57d40f7 commit bf17bcad5fd87313b797cdb6187ef7e42d6e2911
Showing with 2,232 additions and 10,910 deletions.
  1. +1 −1 README.md
  2. +0 −3 docs/02-knora-ontologies/knora-base.md
  3. +0 −4 docs/04-publishing-deployment/configuration.md
  4. +0 −3 docs/04-publishing-deployment/getting-started.md
  5. +2 −49 docs/04-publishing-deployment/updates.md
  6. +1 −3 docs/05-internals/design/api-v2/gravsearch.md
  7. +3 −0 docs/05-internals/design/principles/consistency-checking.md
  8. +1 −1 docs/05-internals/design/principles/design-overview.md
  9. +3 −7 docs/05-internals/design/principles/store-module.md
  10. +5 −10 docs/05-internals/design/principles/triplestore-updates.md
  11. +2 −16 docs/05-internals/development/docker-compose.md
  12. +1 −2 docs/05-internals/development/overview.md
  13. +0 −6 docs/05-internals/development/testing.md
  14. +1 −1 docs/07-lucene/index.md
  15. +1 −4 docs/faq/index.md
  16. +0 −174 test_data/store.triplestore.GraphDBConsistencyCheckingSpec/incunabula-data.ttl
  17. +0 −5 webapi/scripts/.gitignore
  18. +0 −448 webapi/scripts/KnoraRules.pie
  19. +0 −33 webapi/scripts/Readme.md
  20. +0 −2 webapi/scripts/graphdb-drop-knora-prod-repository.ttl
  21. +0 −2 webapi/scripts/graphdb-drop-knora-test-repository.ttl
  22. +0 −2 webapi/scripts/graphdb-drop-knora-test-unit-repository.ttl
  23. +0 −56 webapi/scripts/graphdb-dump-repository.sh
  24. +0 −54 webapi/scripts/graphdb-empty-repository.sh
  25. +0 −44 webapi/scripts/graphdb-free-docker-init-knora-test-minimal.sh
  26. +0 −34 webapi/scripts/graphdb-free-docker-init-knora-test-unit.sh
  27. +0 −44 webapi/scripts/graphdb-free-docker-init-knora-test.sh
  28. +0 −22 webapi/scripts/graphdb-free-knora-test-repository-config.ttl.tmpl
  29. +0 −22 webapi/scripts/graphdb-free-knora-test-unit-repository-config.ttl.tmpl
  30. +0 −34 webapi/scripts/graphdb-free-local-init-knora-test-unit.sh
  31. +0 −44 webapi/scripts/graphdb-free-local-init-knora-test.sh
  32. +0 −10 webapi/scripts/graphdb-knora-index-create.rq
  33. +0 −2 webapi/scripts/graphdb-knora-index-update.rq
  34. +0 −58 webapi/scripts/graphdb-knora-prod-data.expect
  35. +0 −28 webapi/scripts/graphdb-knora-test-data-minimal.expect
  36. +0 −62 webapi/scripts/graphdb-knora-test-data.expect
  37. +0 −28 webapi/scripts/graphdb-knora-test-unit-data-minimal.expect
  38. +0 −42 webapi/scripts/graphdb-se-docker-init-knora-prod-empty.sh
  39. +0 −44 webapi/scripts/graphdb-se-docker-init-knora-prod.sh
  40. +0 −44 webapi/scripts/graphdb-se-docker-init-knora-test-minimal.sh
  41. +0 −44 webapi/scripts/graphdb-se-docker-init-knora-test-unit-minimal.sh
  42. +0 −34 webapi/scripts/graphdb-se-docker-init-knora-test-unit.sh
  43. +0 −44 webapi/scripts/graphdb-se-docker-init-knora-test.sh
  44. +0 −2 webapi/scripts/graphdb-se-drop-knora-prod-repository.ttl
  45. +0 −22 webapi/scripts/graphdb-se-knora-prod-repository-config.ttl.tmpl
  46. +0 −22 webapi/scripts/graphdb-se-knora-test-repository-config.ttl.tmpl
  47. +0 −22 webapi/scripts/graphdb-se-knora-test-unit-repository-config.ttl.tmpl
  48. +0 −42 webapi/scripts/graphdb-se-local-init-knora-prod-empty.sh
  49. +0 −44 webapi/scripts/graphdb-se-local-init-knora-prod.sh
  50. +0 −34 webapi/scripts/graphdb-se-local-init-knora-test-unit.sh
  51. +0 −44 webapi/scripts/graphdb-se-local-init-knora-test.sh
  52. +0 −56 webapi/scripts/graphdb-upload-repository.sh
  53. +0 −38 webapi/scripts/win-graphdb-free-init-knora-test.sh
  54. +0 −25 webapi/scripts/win-graphdb-knora-test-data.ttl
  55. +0 −19 webapi/src/main/resources/application.conf
  56. +0 −2 webapi/src/main/scala/org/knora/webapi/messages/OntologyConstants.scala
  57. +0 −45 webapi/src/main/scala/org/knora/webapi/messages/store/triplestoremessages/GraphDBAPI.scala
  58. +0 −123 webapi/src/main/scala/org/knora/webapi/messages/util/search/SparqlTransformer.scala
  59. +14 −46 webapi/src/main/scala/org/knora/webapi/responders/v2/SearchResponderV2.scala
  60. +0 −8 webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala
  61. +0 −4 webapi/src/main/scala/org/knora/webapi/settings/KnoraSettingsConstants.scala
  62. +0 −1 webapi/src/main/scala/org/knora/webapi/settings/package.scala
  63. +1 −1 webapi/src/main/scala/org/knora/webapi/store/triplestore/TriplestoreManager.scala
  64. +47 −155 webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala
  65. +2 −6 ...pi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/changeParentNode.scala.txt
  66. +0 −13 .../org/knora/webapi/messages/twirl/queries/sparql/admin/createNewAdministrativePermission.scala.txt
  67. +0 −13 ...knora/webapi/messages/twirl/queries/sparql/admin/createNewDefaultObjectAccessPermission.scala.txt
  68. +0 −13 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewGroup.scala.txt
  69. +0 −13 ...i/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewListNode.scala.txt
  70. +0 −13 ...pi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewProject.scala.txt
  71. +0 −13 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/createNewUser.scala.txt
  72. +0 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/deleteNode.scala.txt
  73. +0 −16 ...pi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/deletePermission.scala.txt
  74. +28 −14 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getFileValue.scala.txt
  75. +0 −42 ...src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getFileValueGraphDB.scala.txt
  76. +0 −45 ...rc/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getFileValueStandard.scala.txt
  77. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getGroups.scala.txt
  78. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getListNode.scala.txt
  79. +1 −4 ...main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getListNodeWithChildren.scala.txt
  80. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getLists.scala.txt
  81. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getNodePath.scala.txt
  82. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getParentNode.scala.txt
  83. +1 −4 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getPermissionByIRI.scala.txt
  84. +1 −4 ...src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectAdminData.scala.txt
  85. +1 −4 .../main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectAdminMembers.scala.txt
  86. +1 −4 ...i/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectMembers.scala.txt
  87. +0 −16 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectOfEntity.scala.txt
  88. +1 −4 ...c/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjectPermissions.scala.txt
  89. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getProjects.scala.txt
  90. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/getUsers.scala.txt
  91. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/isEntityUsed.scala.txt
  92. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/isNodeUsed.scala.txt
  93. +0 −16 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateGroup.scala.txt
  94. +0 −16 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateListInfo.scala.txt
  95. +0 −16 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateNodePosition.scala.txt
  96. +0 −16 ...pi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updatePermission.scala.txt
  97. +0 −16 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateProject.scala.txt
  98. +0 −16 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateUser.scala.txt
  99. +0 −16 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/admin/updateUserPassword.scala.txt
  100. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/addValueVersion.scala.txt
  101. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeComment.scala.txt
  102. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeLink.scala.txt
  103. +1 −4 ...pi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/changeResourceLabel.scala.txt
  104. +1 −4 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkResourceDeletion.scala.txt
  105. +1 −4 ...c/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkResourceLabelChange.scala.txt
  106. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/checkValueDeletion.scala.txt
  107. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/ckanDokubib.scala.txt
  108. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/ckanIncunabula.scala.txt
  109. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createLink.scala.txt
  110. +1 −7 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/createValue.scala.txt
  111. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteLink.scala.txt
  112. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteResource.scala.txt
  113. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/deleteValue.scala.txt
  114. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findLinkValueByIri.scala.txt
  115. +1 −4 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findLinkValueByObject.scala.txt
  116. +1 −4 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findResourceWithValue.scala.txt
  117. +1 −4 ...pi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/findValueInVersions.scala.txt
  118. +0 −43 .../org/knora/webapi/messages/twirl/queries/sparql/v1/generateWhereStatementsForGetMapping.scala.txt
  119. +1 −4 ...wirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionByIri.scala.txt
  120. +1 −4 ...a/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionForProjectAndGroup.scala.txt
  121. +1 −4 ...rg/knora/webapi/messages/twirl/queries/sparql/v1/getAdministrativePermissionsForProject.scala.txt
  122. +88 −11 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getContext.scala.txt
  123. +0 −94 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getContextGraphDB.scala.txt
  124. +0 −108 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getContextStandard.scala.txt
  125. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getCreatedResource.scala.txt
  126. +1 −4 ...wirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermission.scala.txt
  127. +1 −4 ...org/knora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermissionByIri.scala.txt
  128. +1 −4 ...ora/webapi/messages/twirl/queries/sparql/v1/getDefaultObjectAccessPermissionsForProject.scala.txt
  129. +1 −4 ...c/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getFileValuesForResource.scala.txt
  130. +62 −17 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGraphData.scala.txt
  131. +0 −98 ...pi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGraphDataGraphDB.scala.txt
  132. +0 −85 ...i/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGraphDataStandard.scala.txt
  133. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupByIri.scala.txt
  134. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupByName.scala.txt
  135. +1 −4 ...i/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupMembersByIri.scala.txt
  136. +1 −4 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroupMembersByName.scala.txt
  137. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getGroups.scala.txt
  138. +72 −11 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getIncomingReferences.scala.txt
  139. +0 −86 ...in/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getIncomingReferencesGraphDB.scala.txt
  140. +0 −92 ...n/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getIncomingReferencesStandard.scala.txt
  141. +1 −4 ...rc/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getLastModificationDate.scala.txt
  142. +1 −4 ...irl/org/knora/webapi/messages/twirl/queries/sparql/v1/getLinkSourceAndTargetPermissions.scala.txt
  143. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getList.scala.txt
  144. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getNodePath.scala.txt
  145. +1 −4 .../main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getObjectAccessPermission.scala.txt
  146. +1 −4 ...ain/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectAdminMembersByIri.scala.txt
  147. +1 −4 ...irl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectAdminMembersByShortname.scala.txt
  148. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByIri.scala.txt
  149. +1 −4 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByShortcode.scala.txt
  150. +1 −4 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectByShortname.scala.txt
  151. +1 −4 ...src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectMembersByIri.scala.txt
  152. +1 −4 ...in/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjectMembersByShortname.scala.txt
  153. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getProjects.scala.txt
  154. +24 −11 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getRegions.scala.txt
  155. +0 −41 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getRegionsGraphDB.scala.txt
  156. +0 −44 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getRegionsStandard.scala.txt
  157. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceClass.scala.txt
  158. +33 −12 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceInfo.scala.txt
  159. +0 −63 ...src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceInfoGraphDB.scala.txt
  160. +0 −53 ...rc/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceInfoStandard.scala.txt
  161. +89 −11 .../twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourcePropertiesAndValues.scala.txt
  162. +0 −102 ...org/knora/webapi/messages/twirl/queries/sparql/v1/getResourcePropertiesAndValuesGraphDB.scala.txt
  163. +0 −109 ...rg/knora/webapi/messages/twirl/queries/sparql/v1/getResourcePropertiesAndValuesStandard.scala.txt
  164. +74 −19 ...rc/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceSearchResult.scala.txt
  165. +0 −97 .../twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceSearchResultGraphDB.scala.txt
  166. +0 −106 ...twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceSearchResultStandard.scala.txt
  167. +1 −4 ...n/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourceTypesForNamedGraph.scala.txt
  168. +1 −4 ...in/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getResourcesByProjectAndType.scala.txt
  169. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUserByEmail.scala.txt
  170. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUserByIri.scala.txt
  171. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getUsers.scala.txt
  172. +48 −11 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getValue.scala.txt
  173. +0 −60 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getValueGraphDB.scala.txt
  174. +0 −68 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getValueStandard.scala.txt
  175. +40 −15 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getVersionHistory.scala.txt
  176. +0 −63 ...c/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getVersionHistoryGraphDB.scala.txt
  177. +0 −66 .../main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/getVersionHistoryStandard.scala.txt
  178. +32 −11 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/isPartOf.scala.txt
  179. +0 −52 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/isPartOfGraphDB.scala.txt
  180. +0 −52 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/isPartOfStandard.scala.txt
  181. +603 −21 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchExtended.scala.txt
  182. +0 −644 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchExtendedGraphDB.scala.txt
  183. +0 −638 ...src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchExtendedStandard.scala.txt
  184. +122 −19 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchFulltext.scala.txt
  185. +0 −138 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchFulltextGraphDB.scala.txt
  186. +0 −153 ...src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v1/searchFulltextStandard.scala.txt
  187. +1 −4 ...rc/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/addCardinalitiesToClass.scala.txt
  188. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/addValueVersion.scala.txt
  189. +1 −4 ...ain/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeClassLabelsOrComments.scala.txt
  190. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkMetadata.scala.txt
  191. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeLinkTarget.scala.txt
  192. +1 −4 ...src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeOntologyMetadata.scala.txt
  193. +3 −12 ...c/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyGuiElement.scala.txt
  194. +1 −4 .../twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changePropertyLabelsOrComments.scala.txt
  195. +1 −4 ...src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeResourceMetadata.scala.txt
  196. +1 −4 ...src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/changeValuePermissions.scala.txt
  197. +1 −4 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/checkResourceDeletion.scala.txt
  198. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/checkValueDeletion.scala.txt
  199. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createClass.scala.txt
  200. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createLink.scala.txt
  201. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createNewMapping.scala.txt
  202. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createOntology.scala.txt
  203. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createProperty.scala.txt
  204. +1 −7 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/createValue.scala.txt
  205. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteClass.scala.txt
  206. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteLink.scala.txt
  207. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteOntology.scala.txt
  208. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteProperty.scala.txt
  209. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteResource.scala.txt
  210. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/deleteValue.scala.txt
  211. +52 −12 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/eraseResource.scala.txt
  212. +0 −79 ...i/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/eraseResourceGraphDB.scala.txt
  213. +0 −71 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/eraseResourceStandard.scala.txt
  214. +1 −4 ...src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getAllOntologyMetadata.scala.txt
  215. +14 −11 ...wirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getAllResourcesInProjectPrequery.scala.txt
  216. +0 −30 ...g/knora/webapi/messages/twirl/queries/sparql/v2/getAllResourcesInProjectPrequeryGraphDB.scala.txt
  217. +0 −28 .../knora/webapi/messages/twirl/queries/sparql/v2/getAllResourcesInProjectPrequeryStandard.scala.txt
  218. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getClassDefinition.scala.txt
  219. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getDeleteDate.scala.txt
  220. +85 −21 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getGraphData.scala.txt
  221. +0 −119 ...pi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getGraphDataGraphDB.scala.txt
  222. +0 −113 ...i/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getGraphDataStandard.scala.txt
  223. +34 −12 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getMapping.scala.txt
  224. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getOntologyGraph.scala.txt
  225. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getOntologyInfo.scala.txt
  226. +1 −4 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getPropertyDefinition.scala.txt
  227. +245 −35 .../twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcePropertiesAndValues.scala.txt
  228. +0 −314 ...org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcePropertiesAndValuesGraphDB.scala.txt
  229. +0 −295 ...rg/knora/webapi/messages/twirl/queries/sparql/v2/getResourcePropertiesAndValuesStandard.scala.txt
  230. +42 −18 .../twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getResourceValueVersionHistory.scala.txt
  231. +0 −62 ...org/knora/webapi/messages/twirl/queries/sparql/v2/getResourceValueVersionHistoryGraphDB.scala.txt
  232. +0 −64 ...rg/knora/webapi/messages/twirl/queries/sparql/v2/getResourceValueVersionHistoryStandard.scala.txt
  233. +36 −19 .../org/knora/webapi/messages/twirl/queries/sparql/v2/getResourcesByClassInProjectPrequery.scala.txt
  234. +0 −61 ...ora/webapi/messages/twirl/queries/sparql/v2/getResourcesByClassInProjectPrequeryGraphDB.scala.txt
  235. +0 −65 ...ra/webapi/messages/twirl/queries/sparql/v2/getResourcesByClassInProjectPrequeryStandard.scala.txt
  236. +1 −4 ...i/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/getStandoffTagByUUID.scala.txt
  237. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isEntityUsed.scala.txt
  238. +1 −4 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/isOntologyUsed.scala.txt
  239. +3 −12 .../main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/replaceClassCardinalities.scala.txt
  240. +135 −26 webapi/src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchFulltext.scala.txt
  241. +0 −138 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchFulltextGraphDB.scala.txt
  242. +0 −172 ...src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchFulltextStandard.scala.txt
  243. +82 −19 .../src/main/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabel.scala.txt
  244. +0 −106 ...in/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabelGraphDB.scala.txt
  245. +0 −118 ...n/twirl/org/knora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabelStandard.scala.txt
  246. 0 ...{searchResourceByLabelSubQuerySelectStandard.scala.txt → searchResourceByLabelSubQuery.scala.txt}
  247. +0 −55 ...nora/webapi/messages/twirl/queries/sparql/v2/searchResourceByLabelSubQuerySelectGraphDB.scala.txt
  248. +1 −4 webapi/src/main/twirl/org/knora/webapi/queries/sparql/v2/isPropertyUsed.scala.txt
  249. +0 −22 webapi/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala
  250. +3 −44 webapi/src/test/scala/org/knora/webapi/store/triplestore/AllTriplestoreSpec.scala
  251. +0 −2,377 webapi/src/test/scala/org/knora/webapi/store/triplestore/GraphDBConsistencyCheckingSpec.scala
@@ -137,7 +137,7 @@ We write automated tests using [ScalaTest](https://www.scalatest.org). You can r

There are three sets of automated tests:

* Unit tests, route-to-route tests, and end-to-end tests are under `webapi/src/test`. To run these, type `graphdb:test` or `graphdb-free:test` (depending on which triplestore you're using) at the SBT console in the `webapi` project. To run a single test, use `graphdb:test-only *NameOfTestSpec`.
* Unit tests, route-to-route tests, and end-to-end tests are under `webapi/src/test`. To run these, type `test` at the SBT console in the `webapi` project. To run a single test, use `testOnly *NameOfTestSpec`.
* Integration tests, which can involve [Sipi](https://github.com/daschswiss/sipi), are under `src/it`. To run these, first start Sipi, then type `it:test` at the SBT console in the `webapi` project.

Whenever you add a new feature or fix a bug, you should add one or more tests
@@ -953,9 +953,6 @@ in user-created ontologies. Three types of consistency rules are enforced:
- Constraints on the types of the subjects and objects of OWL object properties must be satisfied.
- A datatype property may not have an empty string as an object.

The implementation of consistency checking is partly triplestore-dependent; Knora may be able to provide stricter checks
with some triplestores than with others.

### OWL Cardinalities

As noted in [Resources](#resources), each subclass of
@@ -53,10 +53,6 @@ A number of core settings is additionally configurable through system environmen
| app.triplestore.use-https | KNORA_WEBAPI_TRIPLESTORE_USE_HTTPS | false |
| app.triplestore.host | KNORA_WEBAPI_TRIPLESTORE_HOST | localhost |
| app.triplestore.auto-init | KNORA_WEBAPI_TRIPLESTORE_AUTOINIT | false |
| app.triplestore.graphdb.port | KNORA_WEBAPI_TRIPLESTORE_GRAPHDB_PORT | 7200 |
| app.triplestore.graphdb.repository-name | KNORA_WEBAPI_TRIPLESTORE_GRAPHDB_REPOSITORY_NAME | knora-test |
| app.triplestore.graphdb.username | KNORA_WEBAPI_TRIPLESTORE_GRAPHDB_USERNAME | admin |
| app.triplestore.graphdb.password | KNORA_WEBAPI_TRIPLESTORE_GRAPHDB_PASSWORD | root |
| app.triplestore.fuseki.port | KNORA_WEBAPI_TRIPLESTORE_FUSEKI_PORT | 3030 |
| app.triplestore.fuseki.repository-name | KNORA_WEBAPI_TRIPLESTORE_FUSEKI_REPOSITORY_NAME | knora-test |
| app.triplestore.fuseki.username | KNORA_WEBAPI_TRIPLESTORE_FUSEKI_USERNAME | admin |
@@ -50,9 +50,6 @@ DSP-API is designed to work with any standards-compliant
triplestore. It is primarily tested with
[Apache Jena Fuseki](https://jena.apache.org), an open source triplestore.

Built-in support and configuration for a high-performance, proprietary
triplestore [Ontotext GraphDB](http://ontotext.com/products/graphdb/) is
provided but unmaintained (GraphDB must be licensed separately by the user).
Other triplestores are planned.

## Running the DSP-Stack
@@ -15,54 +15,7 @@ manual changes are needed, these will be described in the release notes, and mus
done first.

Before starting a new version of Knora, back up your repository, so you can restore it
in case the automatic repository update fails. You can use one of these scripts
in `webapi/scripts`:

- `fuseki-dump-repository.sh` for Fuseki
- `graphdb-dump-repository.sh` for GraphDB

in case the automatic repository update fails. For Fuseki use `fuseki-dump-repository.sh`
script located in `webapi/scripts`.

For information on command-line options, run the script with no arguments.

## Upgrading from a Knora Version Before 7.0.0

**WARNING**: If you do not follow this procedure, your data may be
corrupted, and Knora may not work.

You must first upgrade to Knora 7.0.0, then upgrade again to the current
version.

The overall procedure is:

1. Back up your repository as described above.

2. Install Knora release 7.0.0, and read the general instructions in
`upgrade/graphdb-se/old/README.md` in that release.

3. Follow the instructions in one of the subsections below for the version you are
upgrading from.

4. Back up your repository again.

5. Install the current release of Knore, and follow any manual update instructions
in its release notes.

6. Start Knora to continue the automatic upgrade.

### Upgrading from Knora 6.0.0 or 6.0.1

1. Follow the instructions in `upgrade/graphdb-se/old/1263-knora-admin/README.md`.

2. Follow the instructions in
[Upgrading from Knora 7.0.0 or Later](#upgrading-from-knora-7-0-0-or-later).

### Upgrading from Knora 5.0.0

1. Follow the instructions in `upgrade/graphdb-se/old/1211-datetime/README.md`.

2. Follow the instructions in `upgrade/graphdb-se/old/1230-delete-previews/README.md`.

3. Follow the instructions in `upgrade/graphdb-se/old/1263-knora-admin/README.md`.

4. Follow the instructions in
[Upgrading from Knora 7.0.0 or Later](#upgrading-from-knora-7-0-0-or-later).
@@ -309,9 +309,7 @@ When the triplestore-specific version of the query is generated:

Gravsearch also provides some virtual properties, which take advantage of forward-chaining inference
as an optimisation if the triplestore provides it. For example, the virtual property
`knora-api:standoffTagHasStartAncestor` is equivalent to `knora-base:standoffTagHasStartParent*`, but
with GraphDB it is implemented using a custom inference rule (in `KnoraRules.pie`) and is therefore more
efficient. If Knora is not using the triplestore's inference, `SparqlTransformer.transformStatementInWhereForNoInference`
`knora-api:standoffTagHasStartAncestor` is equivalent to `knora-base:standoffTagHasStartParent*`. If Knora is not using the triplestore's inference, `SparqlTransformer.transformStatementInWhereForNoInference`
replaces `knora-api:standoffTagHasStartAncestor` with `knora-base:standoffTagHasStartParent*`.

# Optimisation of generated SPARQL
@@ -5,6 +5,9 @@

# Consistency Checking

**Attention!** GraphDB is not supported anymore, therefore parts related
to it in this document are redundant.

## Requirements

Knora is designed to prevent inconsistencies in RDF data,
@@ -26,7 +26,7 @@ Knora is written in [Scala](http://www.scala-lang.org/), using the
[Akka](http://akka.io/) framework for message-based concurrency. It is
designed to work with any standards-compliant triplestore via
the [SPARQL 1.1 Protocol](http://www.w3.org/TR/sparql11-protocol/), but is currently
tested only with [Ontotext GraphDB](http://graphdb.ontotext.com/) (with support
tested only with [Apache Jena Fuseki](https://jena.apache.org) (with support
for other triplestores coming soon).

## Knora APIs
@@ -26,14 +26,10 @@ HTTP-based triplestore support is implemented in the
`org.knora.webapi.triplestore.http` package.

An HTTP-based triplestore is one that is accessed remotely over the HTTP
protocol. `HttpTriplestoreConnector` supports the following triplestores:
protocol. `HttpTriplestoreConnector` supports the open source triplestore
- [Apache Jena Fuseki](https://jena.apache.org).

- Ontotext GraphDB
- Fuseki 2

### GraphDB

### Fuseki 2
### Apache Jena Fuseki

## Embedded Triplestores

@@ -36,16 +36,11 @@ the same data, and may eventually provide functionality to facilitate
this coordination.)

We can assume that each SPARQL update operation will run in its own
database transaction with an isolation level of 'read committed'. This
is what GraphDB does when it receives a SPARQL update over HTTP (see
[GraphDB SE
Transactions](http://graphdb.ontotext.com/documentation/standard/storage.html#transaction-control)).
database transaction with an isolation level of 'read committed'.
We cannot assume that it is possible to run more than one SPARQL update
in a single database transaction. (The [SPARQL 1.1
Protocol](http://www.w3.org/TR/sparql11-protocol/) does not provide a
way to do this, and currently it can be done only by embedding the
triplestore in the application and using a vendor-specific API, but we
cannot require this in Knora.)
in a single database transaction. The [SPARQL 1.1 Protocol](http://www.w3.org/TR/sparql11-protocol/) does not provide a way to do this, and currently it
can be done only by embedding the triplestore in the application and
using a vendor-specific API, but we cannot require this in Knora.)

### Permissions

@@ -253,7 +248,7 @@ Knora enforces consistency constraints using three redundant mechanisms:
1. By doing pre-update checks using SPARQL SELECT queries and cached
ontology data.
2. By doing checks in the `WHERE` clauses of SPARQL updates.
3. By using GraphDB's built-in consistency checker (see
3. **Deprecated**: By using GraphDB's built-in consistency checker (see
[Consistency Checking](consistency-checking.md)).

We take the view that redundant consistency checks are a good thing.
@@ -5,27 +5,13 @@

# Starting the Knora Stack inside Docker Container

To run Knora locally, we provide `docker-compose.yml` which can be used to start GraphDB, Sipi,
To run Knora locally, we provide `docker-compose.yml` which can be used to start Fuseki, Sipi,
Webapi running each in its own Docker container.

For GraphDB it is additionally necessary to define two environment variables:

```
$ export KNORA_GDB_LICENSE # full path to the GraphDB-SE license file, e.g., /Users/name/GDB/GDB.license
$ export KNORA_GDB_HOME # full path to a local folder where GraphDB should store it's data, e.g., /users/name/GDB/home
```

Per default, GraphDB-SE is started. If GraphDB-Free is needed, because there is no awailable license,
then a third environment variable can be set to something like:

```
$ export KNORA_GDB_IMAGE=daschswiss/graphdb-free:8.3.1
```

To run the whole stack:

```
$ docker-compose up
$ make stack-up
```

For additional information please see the [Docker Compose documentation](https://docs.docker.com/compose/)
@@ -10,8 +10,7 @@ installation of Knora. The different parts are:

1. The cloned [DSP-API](https://github.com/dasch-swiss/dsp-api) Github
repository
1. One of the supplied triplestores in the DSP-API Github repository
(GraphDB-SE 8 or Fuseki 3).
1. Fuseki - supplied triplestore in the DSP-API Github repository.
1. Sipi by building from
[source](https://github.com/dasch-swiss/sipi) or using the docker
[image](https://hub.docker.com/r/daschswiss/sipi/)
@@ -5,12 +5,6 @@

# Testing

Prerequisite: Before running any tests, a supported triplestore needs to
be started and initialized through a script inside the "scripts" folder.
For example, when using "GraphDB Free", the nedded script is
"graphdb-free-init-knora-test-unit.sh". Please note the occurrence of
"test-unit" in the name of the script.

## How to Write Unit Tests

1) Inside a test, at the beginning, add the following (change the paths
@@ -6,6 +6,6 @@
# Lucene

The Lucene full-text index provided by the triplestore is used to perform full-text searches in Knora.
The exact behavior can be different depending on the triplestore, e.g., GraphDB or Fuseki.
The exact behavior can be different depending on the triplestore.

* [Lucene Query Parser Syntax](lucene-query-parser-syntax.md)
@@ -29,10 +29,7 @@ we recommend converting it to Knora resources, which are stored as RDF.

### Which triplestores can be used with Knora?

Knora is tested with [Ontotext GraphDB SE](http://graphdb.ontotext.com/).
Our goal is to support several triplestores, including open-source options.
Integration with [Apache Jena Fuseki](https://jena.apache.org/documentation/fuseki2/)
has been partly implemented, but is not currently supported.
Knora is tested with [Apache Jena Fuseki](https://jena.apache.org/).

## Knora Ontologies

0 comments on commit bf17bca

Please sign in to comment.