Skip to content

Commit

Permalink
tul/merge-into-clarin-dspace (#402)
Browse files Browse the repository at this point in the history
* Tul/tmp 4 merge (#401)

* 97425: Fix issue with sessions null value

* 97061: type request param name change to avoid confusion with rest object type &
error codes endpoint changes + IT:
- missing/wrong query param accountRequestType => 400 bad request
- email not valid domain => 422 unprocessable entity

* [CST-7756] refactoring & added missing JavaDoc

* [CST-7756] removed unused service bean

* [CST-7756] minor refactoring  according to the rest contract

* PR #8619: Removed dependency spring-context-support, not needed in main

* [CST-7756] fixed failed tests

* [CST-7756] refactoring

* [CST-7756] added tests to valid subscription parameters

* [CST-7756] added validation logic of params

* [CST-7756] renamed some methods & class

* [CST-7756] minor fix

* [CST-7756] refactored CanSubscribeFeatureIT

* 97425: Implement feedback

* [CST-7756] minor update

* [CST-7756] added missing index field

* [CST-7756] added template for subscription content email

* [CST-7754] removed old code of supervision orders
added a new migration script sql
tested that supervisors can edit only workspace items

* [CST-7756] refactoring

* Remove statusFilter added to Solr browse indexes queries to solve an issue with the local administrators navigation

* [CST-7756] monor fix

* [CST-7756] added unit tests covering methods with business logic

* [CST-7756] sub-daily command and its referred class removed, as subscriptions are sent by subscription-send command

* [CST-7756] updated license header

* 97425: Fix minor issues

* [CST-7756] added instructions to migrate subscriptions from previous versions

* [CST-7756] after merge checkstyle fix

* [CST-7756] extended abstract test

* [CST-7756] updated script

* 99053: Add return_to_pool option to all ProcessingAction except SingleUserReviewAction

* Reinstate config accidentally deleted, added in 30f923a080aa0d927036e0eae609c3bf1a273d35 (#8064) - enables RSS/Atom feeds

* [CST-7756] removed subscriptions for items

* [CST-7756] minor fix

* [CST-7756] extended SubscribeServiceTest in order to use service instance with real (h2) database instead of mocks, so that tests actually store, query and remove subscriptions interacting with database

* [CST-7756] added missing JavaDoc

* [CST-7756] code refactoring

* [CST-7756] renamed test class in order to reflect its actual behavior

* [CST-7756] removed mail template used by previous script

* [CST-7756] code refactoring

* [CST-7756] removed Items section

* [CST-7756] added missing IT

* [CST-7754] updated javadoc

* [CST-7754] updated comment

* [CST-7754] withdrawn item should not allow supervision order

* [CST-7754] moved supervision orders test on workflow items to SupervisionOrderRestRepositoryIT, added test covering the scenario when an admin tries to set a supervision order on a withdrawn item, and when an admin sets a supervision order on a workflow item before sending it back to workspace: supervisor can edit the item only when it goes to workspace status.

* [TLC-380] Browse links and "by regex" links in item display

* [TLC-380] Fix checkstyle and duplicate code

* [TLC-380] Further checkstyle fixes

* [TLC-380] Further checkstyle fixes

* [TLC-380] Refactor browses endpoint for browse link usage

* [TLC-249] Improve 'findByFields' browse refactor

* [TLC-380] Fix browse resource byFields IT

* [TLC-380] Remove unused methods, add ITs

* #8629: Make sure temporary worfklow groups of reviewers get deleted

* #8629: PR feedback refactor

* [CST-7756] implemented community feedbacks

* [CST-7756] added test that proves what happens if an object is access restricted after you have a subscription to it.

* [CST-7756] renamed a method

* [CST-7756] updated subscriptions migration scripts

* [CST-7756] removed 'lastModified_dt' index field

* [CST-7756] minor refactoring

* [CST-7756] added email subject

* [CST-7756] added dissemination for generic DSpace Item

* [CST-7756] If no crosswalk is defined for the Item's entity type, default generic Item one is applied

* IT fix: ReviewManagers repository wide group, not collection workflow group

* Test IT without drop constraint

* [CST-7756] restores security check as was originaly

* [CST-7756] described beans

* #8628: Remove GET shortlivedtokens endpoint & related IT

* [TLC-249] Show Identifier Step, pre-register identifiers

* [TLC-249] Remove unused import in WorkspaceItemServiceImpl

* [TLC-249] Update section count test in SubmissionDefinitionsControllerIT

* [TLC-249] Refactor to support better filter usage, PENDING and MINTED status

* [TLC-249] Add and expose config for enabling register DOI

* [TLC-249] REST backend for identifier config

* [TLC-249] Better status return for new DOIs, write new integration tests

* [TLC-249] Integration tests, keep GET handling in controller

* [TLC-249] Move GET handling back to ItemIdentifierController

* [TLC-249] Checkstyle fixes

* [TLC-249] Licence header fixes

* [TLC-249] Further checkstyle fixes

* [TLC-249] Fix tests, Refactor things to use a LinkRestRepository for GET, Controller for POST

* [TLC-249] Further IT fix for identifiers

* [TLC-249] Licence header fix

* [TLC-249] Address review feedback

Controller updated to be less DOI-specific in its
registration implementation
item-status.register renamed to registerDOI
display types included in section data, for UI hints
comments / javadoc added
DOI status text sent instead of number in status data

As per tdonohue's revew on 2022-01-18

* [TLC-249] Lint fixes

* [TLC-249] Improve model for identifier step data

* [TLC-249] Update configuration identifiers.cfg

* [TLC-249] Remove unused subclass DataIdentifier

* [TLC-249] Update identifier section IT

* [TLC-249] Update integration tests for identifier controller

* [TLC-249] Fix submission controller IT

* [TLC-249] Update canRegisterDOIFeature to check for cfg enabled

* [TLC-249] Refactor identifiers create endpoint

* [TLC-249] Refactor, include controller 'find DSO' operation

* [TLC-249] Throw not implemented for findOne and findAll

* [TLC-249] Fixes and improvements as per review feedback

* [TLC-249] Checkstyle fix

* [TLC-249] return value  as id for IdentifierRest

* [TLC-249] Fix category type in IdentifierRest

* [TLC-249] Update integration tests for IdentifierRestRepository

* [TLC-249] Refactor TrueFilter to get instantiated as singleton

* [TLC-249] Construct canonical handle URL in identifier item link

* [TL-249] Remove example-doi_filter from config, add singleton attr to TrueFilter

* [TL-249] Add always_true_filter to test REST identifier-service.xml config

* [TL-249] Add identifiers.cfg and item-filters.xml config to test data

* [TL-249] Fix imports

* [TL-249] Revert accidental commit to RestResourceController

* [TL-249] Javadoc and other small fixes, DOI unit tests

* [TL-249] Javadoc and other small fixes

Including stripping $Revision$ from filter javadoc.

* [TL-249] Checkstyle fix

* 99200: Delete items after copies have been requested fix

* [CST-7756] added security check into 'subscription-send' script

* Alternate way to restart workflow in case of decline

* Fix for decline when the delete doesn't persist in context before wfi is created again from same item

* [CST-7754] supervising user can perform operations on Workspace item only if they have proper permissions

* [DURACOM-116] process sorted alphabetically

* [TLC-249] Test abandoning of a pending DOI and minting afterwards

* [TLC-249] Ensure property identifiers.item-status.register-doi is set

* Added missing commit in cleanup method

* Update BitstreamStorageServiceImpl.java

Amend commit log message

* [CST-7756] Non-Discoverable and withdrawn items must be excluded from the notification list

* [DURACOM-116] moved sorting to service

* removed the log info

* CST-8936 fix permission for bitstream generated by media-filter

* Updates to LICENSES_THIRD_PARTY for 7.5

* [maven-release-plugin] prepare release dspace-7.5

* Fixed some compile errors

* Fixed some compile errors

* Fixed some compile errors

* Fixed errors which causes tomcat starting errors

* Ignored failing test

* Fixed MetadataExportSearchIT - the dateIssued search filter was commented out.

* Added a new action which push test image for FE integration tests.

* Updated creating of the docker

* changed to proper dependency

* Updated cfg, fixed error because rest.properties.exposed was defined in two configuration files.

* fixed cfg for tests

* Copied fixes for the PRs: 277, 279, 281, 273, 284, 286, 296, 300, 308

* Push docker only to migrate-to-7.5 and not to dtq-dev-7.5

* Update migrate-docker.yml

Updated docker action name

* Updated IT test for Shibboleth auth

* Copied ClarinLicenseImportRestController from another branch

* Shibboleth autologin error solved - new header must be added into Allowed Headers in the Application.java

* Fixed checkstyle issues.

* Internal/fix integration tests 75 (#311)

* trying action with different ref

* fixed checkstyle

* updated config, fixed several integration tests

* removed old zip file

* assurance

* dspace.ui.url was changed to http://localhost:4000

* internal/fix-another-integration-tests (#312)

* Set Default charset to UTF-8 in Integration tests

* Fixed test in the ExternalHandleRestRepositoryIT - problem was with encoding

* Fixed WorkspaceItemRestRepositoryIT#patchRejectLicenseTest - the configuration property that disable LicenseValidation was set to false.

* Fixed ClarinDiscoveryRestControllerIT.java#discoverFacetsDateTestWithLabels
FacetEntryMatcher.dateIssuedFacet(false), was missing

* Fixed ClarinDiscoveryRestControllerIT.java#discoverSearchObjectsTestWithBasicQuery missing FacetEntryMatcher.dateIssuedFacet(false),

* Fixed ClarinDiscoveryRestControllerIT tests by updating the discovery.xml

* Fixed MetadataExportSearchIT.exportMetadataSearchFilterDate - commented out the test for Date Issued date search filter which was removed from the discovery.xml

* test  (#317)

* Initial commit

* Fixed SystemWideAlertRestRepositoryIT - wrong Date comparing, the fix was copied from the upstream

* Copied fix from the upstream

* Enabled distribution license validation.

* Update build.yml

Added -fae to integration tests

* Removed unnecessary check

* Revert to DEFAULT_AMOUNT_FORMATS=81

* Fixed lookupPubmed test

---------

Co-authored-by: milanmajchrak <milan.majchrak@dataquest.sk>
Co-authored-by: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com>

* enable different endpoint to S3 bitstorage (#338)

* enable different endpoint to S3 bitstorage

* modified tests

* Migrate to 7.5 (#274)

* 97298: Self-register - test fixes

* 97298: Self-register - test fixes

* [CST-7756] Rename type property to subscriptionType in the subscriptionType object

* [CST-7756] Fix checkstyle

* [CST-7756] fixed database scripts version number

* [CST-7754] otherworkspace discovery configuration shows only supervised workspace items, when a supervision order is deleted grants given to supervision groups on an item are revoked.

* [CST-7754] test supervision order is deleted if workspaceItem or group is deleted.

* 97183 Processing PR review feedback

* 97538: Unauthorized tests should now be anonymous

* 97538: Remove readability change

* 97538: Remove readability change in IT

* 97414 Advanced workflow actions: implemented feedback on SelectReviewerAction + WorkflowActionRestRepositoryIT

* 97414 Advanced workflow actions: fixed SelectReviewerAction NullPointerException

* [CST-7604] Configuration updated to highlight Orgunit and Person

* 97735: Add a accept range cors header

* Fix license issues

* 98345 Advanced workflow actions - Parse select reviewers step

* 98345 SelectReviewerAction, TaskRestRepositoriesIT and h2 migration

* 98433 Reject button mostly works - still triggers a 404 in console though

* 98434: Advanced workflow - refactor scoreReview workflow

* 98434: IT fix

* 98433: Refactoring SingleUserReviewAction & general refactoring in Actions
- Fix in AutoAssignAction that selected reviewer didn't get registered as new InProgressSubmissionUser

* 98433: IT fixes now that access rights are now moved to selected reviewers in AutoAssignAction

* [CST-7756] removed unused param

* 98462: Use discovery configurations in browse

* [DURACOM-113] add jfif extension on bitstream formats

* 98462: Refactor change and add admin tests

* 97538: The search rest method should be public

* 97538: Alter IT for public vocabulary search method

* 97183 Tests for findItemsWithEdit and countItemsWithEdit methods of ItemServiceImpl

* 97080: #8613 - Doc for the prefix solr field

* Implemented community feedbacks

* 97425: Fix issue with sessions null value

* 97061: type request param name change to avoid confusion with rest object type &
error codes endpoint changes + IT:
- missing/wrong query param accountRequestType => 400 bad request
- email not valid domain => 422 unprocessable entity

* [CST-7756] refactoring & added missing JavaDoc

* [CST-7756] removed unused service bean

* [CST-7756] minor refactoring  according to the rest contract

* PR #8619: Removed dependency spring-context-support, not needed in main

* [CST-7756] fixed failed tests

* [CST-7756] refactoring

* [CST-7756] added tests to valid subscription parameters

* [CST-7756] added validation logic of params

* [CST-7756] renamed some methods & class

* [CST-7756] minor fix

* [CST-7756] refactored CanSubscribeFeatureIT

* 97425: Implement feedback

* [CST-7756] minor update

* [CST-7756] added missing index field

* [CST-7756] added template for subscription content email

* [CST-7754] removed old code of supervision orders
added a new migration script sql
tested that supervisors can edit only workspace items

* [CST-7756] refactoring

* Remove statusFilter added to Solr browse indexes queries to solve an issue with the local administrators navigation

* [CST-7756] monor fix

* [CST-7756] added unit tests covering methods with business logic

* [CST-7756] sub-daily command and its referred class removed, as subscriptions are sent by subscription-send command

* [CST-7756] updated license header

* 97425: Fix minor issues

* [CST-7756] added instructions to migrate subscriptions from previous versions

* [CST-7756] after merge checkstyle fix

* [CST-7756] extended abstract test

* [CST-7756] updated script

* 99053: Add return_to_pool option to all ProcessingAction except SingleUserReviewAction

* Reinstate config accidentally deleted, added in 30f923a080aa0d927036e0eae609c3bf1a273d35 (#8064) - enables RSS/Atom feeds

* [CST-7756] removed subscriptions for items

* [CST-7756] minor fix

* [CST-7756] extended SubscribeServiceTest in order to use service instance with real (h2) database instead of mocks, so that tests actually store, query and remove subscriptions interacting with database

* [CST-7756] added missing JavaDoc

* [CST-7756] code refactoring

* [CST-7756] renamed test class in order to reflect its actual behavior

* [CST-7756] removed mail template used by previous script

* [CST-7756] code refactoring

* [CST-7756] removed Items section

* [CST-7756] added missing IT

* [CST-7754] updated javadoc

* [CST-7754] updated comment

* [CST-7754] withdrawn item should not allow supervision order

* [CST-7754] moved supervision orders test on workflow items to SupervisionOrderRestRepositoryIT, added test covering the scenario when an admin tries to set a supervision order on a withdrawn item, and when an admin sets a supervision order on a workflow item before sending it back to workspace: supervisor can edit the item only when it goes to workspace status.

* [TLC-380] Browse links and "by regex" links in item display

* [TLC-380] Fix checkstyle and duplicate code

* [TLC-380] Further checkstyle fixes

* [TLC-380] Further checkstyle fixes

* [TLC-380] Refactor browses endpoint for browse link usage

* [TLC-249] Improve 'findByFields' browse refactor

* [TLC-380] Fix browse resource byFields IT

* [TLC-380] Remove unused methods, add ITs

* #8629: Make sure temporary worfklow groups of reviewers get deleted

* #8629: PR feedback refactor

* [CST-7756] implemented community feedbacks

* [CST-7756] added test that proves what happens if an object is access restricted after you have a subscription to it.

* [CST-7756] renamed a method

* [CST-7756] updated subscriptions migration scripts

* [CST-7756] removed 'lastModified_dt' index field

* [CST-7756] minor refactoring

* [CST-7756] added email subject

* [CST-7756] added dissemination for generic DSpace Item

* [CST-7756] If no crosswalk is defined for the Item's entity type, default generic Item one is applied

* IT fix: ReviewManagers repository wide group, not collection workflow group

* Test IT without drop constraint

* [CST-7756] restores security check as was originaly

* [CST-7756] described beans

* #8628: Remove GET shortlivedtokens endpoint & related IT

* [TLC-249] Show Identifier Step, pre-register identifiers

* [TLC-249] Remove unused import in WorkspaceItemServiceImpl

* [TLC-249] Update section count test in SubmissionDefinitionsControllerIT

* [TLC-249] Refactor to support better filter usage, PENDING and MINTED status

* [TLC-249] Add and expose config for enabling register DOI

* [TLC-249] REST backend for identifier config

* [TLC-249] Better status return for new DOIs, write new integration tests

* [TLC-249] Integration tests, keep GET handling in controller

* [TLC-249] Move GET handling back to ItemIdentifierController

* [TLC-249] Checkstyle fixes

* [TLC-249] Licence header fixes

* [TLC-249] Further checkstyle fixes

* [TLC-249] Fix tests, Refactor things to use a LinkRestRepository for GET, Controller for POST

* [TLC-249] Further IT fix for identifiers

* [TLC-249] Licence header fix

* [TLC-249] Address review feedback

Controller updated to be less DOI-specific in its
registration implementation
item-status.register renamed to registerDOI
display types included in section data, for UI hints
comments / javadoc added
DOI status text sent instead of number in status data

As per tdonohue's revew on 2022-01-18

* [TLC-249] Lint fixes

* [TLC-249] Improve model for identifier step data

* [TLC-249] Update configuration identifiers.cfg

* [TLC-249] Remove unused subclass DataIdentifier

* [TLC-249] Update identifier section IT

* [TLC-249] Update integration tests for identifier controller

* [TLC-249] Fix submission controller IT

* [TLC-249] Update canRegisterDOIFeature to check for cfg enabled

* [TLC-249] Refactor identifiers create endpoint

* [TLC-249] Refactor, include controller 'find DSO' operation

* [TLC-249] Throw not implemented for findOne and findAll

* [TLC-249] Fixes and improvements as per review feedback

* [TLC-249] Checkstyle fix

* [TLC-249] return value  as id for IdentifierRest

* [TLC-249] Fix category type in IdentifierRest

* [TLC-249] Update integration tests for IdentifierRestRepository

* [TLC-249] Refactor TrueFilter to get instantiated as singleton

* [TLC-249] Construct canonical handle URL in identifier item link

* [TL-249] Remove example-doi_filter from config, add singleton attr to TrueFilter

* [TL-249] Add always_true_filter to test REST identifier-service.xml config

* [TL-249] Add identifiers.cfg and item-filters.xml config to test data

* [TL-249] Fix imports

* [TL-249] Revert accidental commit to RestResourceController

* [TL-249] Javadoc and other small fixes, DOI unit tests

* [TL-249] Javadoc and other small fixes

Including stripping $Revision$ from filter javadoc.

* [TL-249] Checkstyle fix

* 99200: Delete items after copies have been requested fix

* [CST-7756] added security check into 'subscription-send' script

* Alternate way to restart workflow in case of decline

* Fix for decline when the delete doesn't persist in context before wfi is created again from same item

* [CST-7754] supervising user can perform operations on Workspace item only if they have proper permissions

* [DURACOM-116] process sorted alphabetically

* [TLC-249] Test abandoning of a pending DOI and minting afterwards

* [TLC-249] Ensure property identifiers.item-status.register-doi is set

* Added missing commit in cleanup method

* Update BitstreamStorageServiceImpl.java

Amend commit log message

* [CST-7756] Non-Discoverable and withdrawn items must be excluded from the notification list

* [DURACOM-116] moved sorting to service

* removed the log info

* CST-8936 fix permission for bitstream generated by media-filter

* Updates to LICENSES_THIRD_PARTY for 7.5

* [maven-release-plugin] prepare release dspace-7.5

* Fixed some compile errors

* Fixed some compile errors

* Fixed some compile errors

* Fixed errors which causes tomcat starting errors

* Ignored failing test

* Fixed MetadataExportSearchIT - the dateIssued search filter was commented out.

* Added a new action which push test image for FE integration tests.

* Updated creating of the docker

* changed to proper dependency

* Updated cfg, fixed error because rest.properties.exposed was defined in two configuration files.

* fixed cfg for tests

* Copied fixes for the PRs: 277, 279, 281, 273, 284, 286, 296, 300, 308

* Push docker only to migrate-to-7.5 and not to dtq-dev-7.5

* Update migrate-docker.yml

Updated docker action name

* Updated IT test for Shibboleth auth

* Copied ClarinLicenseImportRestController from another branch

* Shibboleth autologin error solved - new header must be added into Allowed Headers in the Application.java

* Fixed checkstyle issues.

* Internal/fix integration tests 75 (#311)

* trying action with different ref

* fixed checkstyle

* updated config, fixed several integration tests

* removed old zip file

* assurance

* dspace.ui.url was changed to http://localhost:4000

* internal/fix-another-integration-tests (#312)

* Set Default charset to UTF-8 in Integration tests

* Fixed test in the ExternalHandleRestRepositoryIT - problem was with encoding

* Fixed WorkspaceItemRestRepositoryIT#patchRejectLicenseTest - the configuration property that disable LicenseValidation was set to false.

* Fixed ClarinDiscoveryRestControllerIT.java#discoverFacetsDateTestWithLabels
FacetEntryMatcher.dateIssuedFacet(false), was missing

* Fixed ClarinDiscoveryRestControllerIT.java#discoverSearchObjectsTestWithBasicQuery missing FacetEntryMatcher.dateIssuedFacet(false),

* Fixed ClarinDiscoveryRestControllerIT tests by updating the discovery.xml

* Fixed MetadataExportSearchIT.exportMetadataSearchFilterDate - commented out the test for Date Issued date search filter which was removed from the discovery.xml

* test  (#317)

* Initial commit

* Fixed SystemWideAlertRestRepositoryIT - wrong Date comparing, the fix was copied from the upstream

* Copied fix from the upstream

* Enabled distribution license validation.

* Update build.yml

Added -fae to integration tests

* Removed unnecessary check

* Revert to DEFAULT_AMOUNT_FORMATS=81

* Fixed lookupPubmed test

---------

Co-authored-by: milanmajchrak <milan.majchrak@dataquest.sk>
Co-authored-by: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com>

* enable different endpoint to S3 bitstorage (#338)

* enable different endpoint to S3 bitstorage

* modified tests

---------

Co-authored-by: Marie Verdonck <maria.verdonck@atmire.com>
Co-authored-by: Giuseppe Digilio <giuseppe.digilio@4science.it>
Co-authored-by: corrado lombardi <corrado.lombardi@4science.com>
Co-authored-by: Mohamed Saber Eskander <mohamed.eskander@4science.com>
Co-authored-by: Koen Pauwels <koen.pauwels@atmire.com>
Co-authored-by: Jens Vannerum <jens.vannerum@atmire.com>
Co-authored-by: jensroets <jens.roets@atmire.com>
Co-authored-by: Yana De Pauw <yana@atmire.com>
Co-authored-by: Tim Donohue <tim.donohue@lyrasis.org>
Co-authored-by: jensvannerum <78496674+jensvannerum@users.noreply.github.com>
Co-authored-by: Mykhaylo <michele.boychuk@gmail.com>
Co-authored-by: Francesco Pio Scognamiglio <francescopio.scognamiglio@4science.it>
Co-authored-by: Nona Luypaert <nona.luypaert@atmire.com>
Co-authored-by: Toni Prieto <antonio.juan.prieto@upc.edu>
Co-authored-by: Alexandre Vryghem <alexandre@atmire.com>
Co-authored-by: Kim Shepherd <kim@shepherd.nz>
Co-authored-by: Pascal-Nicolas Becker <dspace@pascal-becker.de>
Co-authored-by: Agustina Martinez <am857@cam.ac.uk>
Co-authored-by: Raf Ponsaerts <raf.ponsaerts@atmire.com>
Co-authored-by: Andrea Bollini <andrea.bollini@4science.it>
Co-authored-by: MajoBerger <marian.berger@dataquest.sk>
Co-authored-by: MajoBerger <88670521+MajoBerger@users.noreply.github.com>

* Copied fix from 303

* Copied fix from 302, 319, 314

* Copied fix from 331

* Copied fix from 295

* Copied fix from 337, 339

* Removed ClarinLicenseImportRestController.java according to 273

* Eperson.hasPasswordSet was missing and one checkstyle violation as occurred.

* Docker image should be generated.

* Full BE customization for TUL (#329)

* define citace pro in the config file

* rename the config and add it into the default res.properties.exposed

* configure the gg analytics

* add email config propertyy for the contact page

* add the email for lr.help.email

* remove redundant email

---------

Co-authored-by: HuynhKhoa1601 <huynhnhatkhoa21@gmail.com>
Co-authored-by: HuynhKhoa1601 <89246737+HuynhKhoa1601@users.noreply.github.com>

* Temp file

* Migrate to 7.5 (#343)

* 97298: Self-register - test fixes

* [CST-7756] Rename type property to subscriptionType in the subscriptionType object

* [CST-7756] Fix checkstyle

* [CST-7756] fixed database scripts version number

* [CST-7754] otherworkspace discovery configuration shows only supervised workspace items, when a supervision order is deleted grants given to supervision groups on an item are revoked.

* [CST-7754] test supervision order is deleted if workspaceItem or group is deleted.

* 97183 Processing PR review feedback

* 97538: Unauthorized tests should now be anonymous

* 97538: Remove readability change

* 97538: Remove readability change in IT

* 97414 Advanced workflow actions: implemented feedback on SelectReviewerAction + WorkflowActionRestRepositoryIT

* 97414 Advanced workflow actions: fixed SelectReviewerAction NullPointerException

* [CST-7604] Configuration updated to highlight Orgunit and Person

* 97735: Add a accept range cors header

* Fix license issues

* 98345 Advanced workflow actions - Parse select reviewers step

* 98345 SelectReviewerAction, TaskRestRepositoriesIT and h2 migration

* 98433 Reject button mostly works - still triggers a 404 in console though

* 98434: Advanced workflow - refactor scoreReview workflow

* 98434: IT fix

* 98433: Refactoring SingleUserReviewAction & general refactoring in Actions
- Fix in AutoAssignAction that selected reviewer didn't get registered as new InProgressSubmissionUser

* 98433: IT fixes now that access rights are now moved to selected reviewers in AutoAssignAction

* [CST-7756] removed unused param

* 98462: Use discovery configurations in browse

* [DURACOM-113] add jfif extension on bitstream formats

* 98462: Refactor change and add admin tests

* 97538: The search rest method should be public

* 97538: Alter IT for public vocabulary search method

* 97183 Tests for findItemsWithEdit and countItemsWithEdit methods of ItemServiceImpl

* 97080: #8613 - Doc for the prefix solr field

* Implemented community feedbacks

* 97425: Fix issue with sessions null value

* 97061: type request param name change to avoid confusion with rest object type &
error codes endpoint changes + IT:
- missing/wrong query param accountRequestType => 400 bad request
- email not valid domain => 422 unprocessable entity

* [CST-7756] refactoring & added missing JavaDoc

* [CST-7756] removed unused service bean

* [CST-7756] minor refactoring  according to the rest contract

* PR #8619: Removed dependency spring-context-support, not needed in main

* [CST-7756] fixed failed tests

* [CST-7756] refactoring

* [CST-7756] added tests to valid subscription parameters

* [CST-7756] added validation logic of params

* [CST-7756] renamed some methods & class

* [CST-7756] minor fix

* [CST-7756] refactored CanSubscribeFeatureIT

* 97425: Implement feedback

* [CST-7756] minor update

* [CST-7756] added missing index field

* [CST-7756] added template for subscription content email

* [CST-7754] removed old code of supervision orders
added a new migration script sql
tested that supervisors can edit only workspace items

* [CST-7756] refactoring

* Remove statusFilter added to Solr browse indexes queries to solve an issue with the local administrators navigation

* [CST-7756] monor fix

* [CST-7756] added unit tests covering methods with business logic

* [CST-7756] sub-daily command and its referred class removed, as subscriptions are sent by subscription-send command

* [CST-7756] updated license header

* 97425: Fix minor issues

* [CST-7756] added instructions to migrate subscriptions from previous versions

* [CST-7756] after merge checkstyle fix

* [CST-7756] extended abstract test

* [CST-7756] updated script

* 99053: Add return_to_pool option to all ProcessingAction except SingleUserReviewAction

* Reinstate config accidentally deleted, added in 30f923a080aa0d927036e0eae609c3bf1a273d35 (#8064) - enables RSS/Atom feeds

* [CST-7756] removed subscriptions for items

* [CST-7756] minor fix

* [CST-7756] extended SubscribeServiceTest in order to use service instance with real (h2) database instead of mocks, so that tests actually store, query and remove subscriptions interacting with database

* [CST-7756] added missing JavaDoc

* [CST-7756] code refactoring

* [CST-7756] renamed test class in order to reflect its actual behavior

* [CST-7756] removed mail template used by previous script

* [CST-7756] code refactoring

* [CST-7756] removed Items section

* [CST-7756] added missing IT

* [CST-7754] updated javadoc

* [CST-7754] updated comment

* [CST-7754] withdrawn item should not allow supervision order

* [CST-7754] moved supervision orders test on workflow items to SupervisionOrderRestRepositoryIT, added test covering the scenario when an admin tries to set a supervision order on a withdrawn item, and when an admin sets a supervision order on a workflow item before sending it back to workspace: supervisor can edit the item only when it goes to workspace status.

* [TLC-380] Browse links and "by regex" links in item display

* [TLC-380] Fix checkstyle and duplicate code

* [TLC-380] Further checkstyle fixes

* [TLC-380] Further checkstyle fixes

* [TLC-380] Refactor browses endpoint for browse link usage

* [TLC-249] Improve 'findByFields' browse refactor

* [TLC-380] Fix browse resource byFields IT

* [TLC-380] Remove unused methods, add ITs

* #8629: Make sure temporary worfklow groups of reviewers get deleted

* #8629: PR feedback refactor

* [CST-7756] implemented community feedbacks

* [CST-7756] added test that proves what happens if an object is access restricted after you have a subscription to it.

* [CST-7756] renamed a method

* [CST-7756] updated subscriptions migration scripts

* [CST-7756] removed 'lastModified_dt' index field

* [CST-7756] minor refactoring

* [CST-7756] added email subject

* [CST-7756] added dissemination for generic DSpace Item

* [CST-7756] If no crosswalk is defined for the Item's entity type, default generic Item one is applied

* IT fix: ReviewManagers repository wide group, not collection workflow group

* Test IT without drop constraint

* [CST-7756] restores security check as was originaly

* [CST-7756] described beans

* #8628: Remove GET shortlivedtokens endpoint & related IT

* [TLC-249] Show Identifier Step, pre-register identifiers

* [TLC-249] Remove unused import in WorkspaceItemServiceImpl

* [TLC-249] Update section count test in SubmissionDefinitionsControllerIT

* [TLC-249] Refactor to support better filter usage, PENDING and MINTED status

* [TLC-249] Add and expose config for enabling register DOI

* [TLC-249] REST backend for identifier config

* [TLC-249] Better status return for new DOIs, write new integration tests

* [TLC-249] Integration tests, keep GET handling in controller

* [TLC-249] Move GET handling back to ItemIdentifierController

* [TLC-249] Checkstyle fixes

* [TLC-249] Licence header fixes

* [TLC-249] Further checkstyle fixes

* [TLC-249] Fix tests, Refactor things to use a LinkRestRepository for GET, Controller for POST

* [TLC-249] Further IT fix for identifiers

* [TLC-249] Licence header fix

* [TLC-249] Address review feedback

Controller updated to be less DOI-specific in its
registration implementation
item-status.register renamed to registerDOI
display types included in section data, for UI hints
comments / javadoc added
DOI status text sent instead of number in status data

As per tdonohue's revew on 2022-01-18

* [TLC-249] Lint fixes

* [TLC-249] Improve model for identifier step data

* [TLC-249] Update configuration identifiers.cfg

* [TLC-249] Remove unused subclass DataIdentifier

* [TLC-249] Update identifier section IT

* [TLC-249] Update integration tests for identifier controller

* [TLC-249] Fix submission controller IT

* [TLC-249] Update canRegisterDOIFeature to check for cfg enabled

* [TLC-249] Refactor identifiers create endpoint

* [TLC-249] Refactor, include controller 'find DSO' operation

* [TLC-249] Throw not implemented for findOne and findAll

* [TLC-249] Fixes and improvements as per review feedback

* [TLC-249] Checkstyle fix

* [TLC-249] return value  as id for IdentifierRest

* [TLC-249] Fix category type in IdentifierRest

* [TLC-249] Update integration tests for IdentifierRestRepository

* [TLC-249] Refactor TrueFilter to get instantiated as singleton

* [TLC-249] Construct canonical handle URL in identifier item link

* [TL-249] Remove example-doi_filter from config, add singleton attr to TrueFilter

* [TL-249] Add always_true_filter to test REST identifier-service.xml config

* [TL-249] Add identifiers.cfg and item-filters.xml config to test data

* [TL-249] Fix imports

* [TL-249] Revert accidental commit to RestResourceController

* [TL-249] Javadoc and other small fixes, DOI unit tests

* [TL-249] Javadoc and other small fixes

Including stripping $Revision$ from filter javadoc.

* [TL-249] Checkstyle fix

* 99200: Delete items after copies have been requested fix

* [CST-7756] added security check into 'subscription-send' script

* Alternate way to restart workflow in case of decline

* Fix for decline when the delete doesn't persist in context before wfi is created again from same item

* [CST-7754] supervising user can perform operations on Workspace item only if they have proper permissions

* [DURACOM-116] process sorted alphabetically

* [TLC-249] Test abandoning of a pending DOI and minting afterwards

* [TLC-249] Ensure property identifiers.item-status.register-doi is set

* Added missing commit in cleanup method

* Update BitstreamStorageServiceImpl.java

Amend commit log message

* [CST-7756] Non-Discoverable and withdrawn items must be excluded from the notification list

* [DURACOM-116] moved sorting to service

* removed the log info

* CST-8936 fix permission for bitstream generated by media-filter

* Updates to LICENSES_THIRD_PARTY for 7.5

* [maven-release-plugin] prepare release dspace-7.5

* Fixed some compile errors

* Fixed some compile errors

* Fixed some compile errors

* Fixed errors which causes tomcat starting errors

* Ignored failing test

* Fixed MetadataExportSearchIT - the dateIssued search filter was commented out.

* Added a new action which push test image for FE integration tests.

* Updated creating of the docker

* changed to proper dependency

* Updated cfg, fixed error because rest.properties.exposed was defined in two configuration files.

* fixed cfg for tests

* Copied fixes for the PRs: 277, 279, 281, 273, 284, 286, 296, 300, 308

* Push docker only to migrate-to-7.5 and not to dtq-dev-7.5

* Update migrate-docker.yml

Updated docker action name

* Updated IT test for Shibboleth auth

* Copied ClarinLicenseImportRestController from another branch

* Shibboleth autologin error solved - new header must be added into Allowed Headers in the Application.java

* Fixed checkstyle issues.

* Internal/fix integration tests 75 (#311)

* trying action with different ref

* fixed checkstyle

* updated config, fixed several integration tests

* removed old zip file

* assurance

* dspace.ui.url was changed to http://localhost:4000

* internal/fix-another-integration-tests (#312)

* Set Default charset to UTF-8 in Integration tests

* Fixed test in the ExternalHandleRestRepositoryIT - problem was with encoding

* Fixed WorkspaceItemRestRepositoryIT#patchRejectLicenseTest - the configuration property that disable LicenseValidation was set to false.

* Fixed ClarinDiscoveryRestControllerIT.java#discoverFacetsDateTestWithLabels
FacetEntryMatcher.dateIssuedFacet(false), was missing

* Fixed ClarinDiscoveryRestControllerIT.java#discoverSearchObjectsTestWithBasicQuery missing FacetEntryMatcher.dateIssuedFacet(false),

* Fixed ClarinDiscoveryRestControllerIT tests by updating the discovery.xml

* Fixed MetadataExportSearchIT.exportMetadataSearchFilterDate - commented out the test for Date Issued date search filter which was removed from the discovery.xml

* test  (#317)

* Initial commit

* Fixed SystemWideAlertRestRepositoryIT - wrong Date comparing, the fix was copied from the upstream

* Copied fix from the upstream

* Enabled distribution license validation.

* Update build.yml

Added -fae to integration tests

* Removed unnecessary check

* Revert to DEFAULT_AMOUNT_FORMATS=81

* Fixed lookupPubmed test

---------

Co-authored-by: milanmajchrak <milan.majchrak@dataquest.sk>
Co-authored-by: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com>

* enable different endpoint to S3 bitstorage (#338)

* enable different endpoint to S3 bitstorage

* modified tests

---------

Co-authored-by: Marie Verdonck <maria.verdonck@atmire.com>
Co-authored-by: Giuseppe Digilio <giuseppe.digilio@4science.it>
Co-authored-by: corrado lombardi <corrado.lombardi@4science.com>
Co-authored-by: Mohamed Saber Eskander <mohamed.eskander@4science.com>
Co-authored-by: Koen Pauwels <koen.pauwels@atmire.com>
Co-authored-by: Jens Vannerum <jens.vannerum@atmire.com>
Co-authored-by: jensroets <jens.roets@atmire.com>
Co-authored-by: Yana De Pauw <yana@atmire.com>
Co-authored-by: Tim Donohue <tim.donohue@lyrasis.org>
Co-authored-by: jensvannerum <78496674+jensvannerum@users.noreply.github.com>
Co-authored-by: Mykhaylo <michele.boychuk@gmail.com>
Co-authored-by: Francesco Pio Scognamiglio <francescopio.scognamiglio@4science.it>
Co-authored-by: Nona Luypaert <nona.luypaert@atmire.com>
Co-authored-by: Toni Prieto <antonio.juan.prieto@upc.edu>
Co-authored-by: Alexandre Vryghem <alexandre@atmire.com>
Co-authored-by: Kim Shepherd <kim@shepherd.nz>
Co-authored-by: Pascal-Nicolas Becker <dspace@pascal-becker.de>
Co-authored-by: Agustina Martinez <am857@cam.ac.uk>
Co-authored-by: Raf Ponsaerts <raf.ponsaerts@atmire.com>
Co-authored-by: Andrea Bollini <andrea.bollini@4science.it>
Co-authored-by: MajoBerger <marian.berger@dataquest.sk>
Co-authored-by: MajoBerger <88670521+MajoBerger@users.noreply.github.com>

* Removed unused class

* Updated docker.yml

* Updated cfg (#348)

* Fixed from port 4000 to 8080 (#350)

* add redeploy to dev-5 -> curl call to deploy action

* add redeploy to dev-5 -> curl call to deploy action

* correct redeploy branch in github action

* Removed duplicate definition of the property (#353)

* internal/shibboleth-missing-one-error-page

* The netId is added to the user which is logged in via shibboleth.

* Fixed failing integration tests.

* Shib login filter returns the duplicate error

* Fixed checkstyle issues

* Added an email param into error response

* Try to fix IT

* Fixed some IT

* The user is not registered if he doesn't have the email

* Fixed IT - there must be unique handle

* migrated-7.5/oai-is-not-working (#355)

* Fixed wront `dspace.server.url` property value.

* Updated scripts

* Updated scripts

* Fixed IT - there must be unique handle

* Removed changes we don't want to have

* Added empty row

* Merge actual 7.5. version into TUL (#357)

* 102-BE/cannot-read-big-file-by-readAllBytes (#277)

* replace readAllBytes

* fix test errors

* 103-be/shibboleth-login-wrong-error-page (#279)

* The user is redireced to the FE after wrong shibboleth authentication.

* Changed redirect URLs

* Fixed checkstyle issues

* Copied ShibbolethFilterIT into ClarinShibbolethFilterIT because the tests did must be updated.

* 105-be/user-is-not-registered-after-shibboleth-login (#281)

* firstname and lastname is not required for proper Shibboleth login.

* Fixed IT to be failed if code is wrong

* 88-BE/license-labels-are-missing-icons (#273)

* License label icon can be null

* user rest repository for license import

* Fixed checkstyle issues

* Fixed failing IT

---------

Co-authored-by: milanmajchrak <milan.majchrak@dataquest.sk>

* 110-be/imported-item-should-not-regenerate-certain-metadata-fields (#284)

* Created test which fail when issue happens

* Some metadata values are not updated during the import.

* Changed logging (#286)

* 116 be/deleted bitstreams cannot be imported (#296)

* Every bitstream is deleted after updating it. If the sequenceId is null, use default value.

* added logs and fixed error message

* Fixed checkstyle issues

* Added some logs.

---------

Co-authored-by: Michaela Paurikova <michaela.paurikova@dataquest.sk>

* 80-BE/import-tasklistitem (#300)

* create method and test

* test runs

* condition of membership

* throw exception soon and explain better (#308)

* added commit (#306)

* 87-BE/adding-missing-attributes (#303)

* add welcome_info and can_edit_submission_metadata

* added missing attributes to the database

* errors from review

* 119-BE/remove-validation-of-deleted-bitstreams (#302)

* remove validation control for deleted bitstream

* added log

* fix review comments

* added mvn argument fail-at-end (#319)

* added mvn argument fail-at-end

* see mvn version

* see maven version

* -fae

* final version of build.yml

* 75-BE/missing-handles (#314)

* create handle without dspace object

* new controller for import handle without dspace object

* create handle for workspaceitem

* using of existing handle if it exists (#316)

* checkstyle

* fix failed test

* added whitespace after for

* review

* removed authorization for handle creation

* remove unneeded import

* checkstyle

* 122-be/restricted-item-download-issues (#331)

* Initial commit

* Remove the error when the ClarinLicense doesn't require any additional user metadata and the file cannot be downloaded because the user didn't fill in any user metadata.

* The user cannot download the item with ClarinLicense that doesn't require user metadata, but controller methods required this information.

* Be/fixed bitstreams added user metadata (#295)

* 116-be/deleted-bitstreams-cannot-be-imported (#291)

* Every bitstream is deleted after updating it. If the sequenceId is null, use default value.

* added logs and fixed error message

* Fixed checkstyle issues

* Added some logs.

---------

Co-authored-by: Michaela Paurikova <michaela.paurikova@dataquest.sk>

* 76-BE/import-user-metadata (#294)

* new controller for user metadata import

* import user metadata works based on created tests

* remove error from python import

* checkstyle

* 76-BE/import-user-metadata-with-fixed-bitstream (#307)

* new controller for user metadata import

* import user metadata works based on created tests

* remove error from python import

* checkstyle

* fix import user_metadata

* fix mishmash with eperson_id and user_registration_id

* create user registration and eperson separatelly, checkstyle

* edited import user metadata

* checkstyle

---------

Co-authored-by: Michaela Paurikova <michaela.paurikova@dataquest.sk>
Co-authored-by: Paurikova2 <107862249+Paurikova2@users.noreply.github.com>

* Internal/fix integration tests 75 (#311)

* trying action with different ref

* fixed checkstyle

* updated config, fixed several integration tests

* removed old zip file

* assurance

* dspace.ui.url was changed to http://localhost:4000

* internal/fix-another-integration-tests (#312)

* Set Default charset to UTF-8 in Integration tests

* Fixed test in the ExternalHandleRestRepositoryIT - problem was with encoding

* Fixed WorkspaceItemRestRepositoryIT#patchRejectLicenseTest - the configuration property that disable LicenseValidation was set to false.

* Fixed ClarinDiscoveryRestControllerIT.java#discoverFacetsDateTestWithLabels
FacetEntryMatcher.dateIssuedFacet(false), was missing

* Fixed ClarinDiscoveryRestControllerIT.java#discoverSearchObjectsTestWithBasicQuery missing FacetEntryMatcher.dateIssuedFacet(false),

* Fixed ClarinDiscoveryRestControllerIT tests by updating the discovery.xml

* Fixed MetadataExportSearchIT.exportMetadataSearchFilterDate - commented out the test for Date Issued date search filter which was removed from the discovery.xml

* test  (#317)

* Initial commit

* Fixed SystemWideAlertRestRepositoryIT - wrong Date comparing, the fix was copied from the upstream

* Copied fix from the upstream

* Enabled distribution license validation.

* Update build.yml

Added -fae to integration tests

* Removed unnecessary check

* Revert to DEFAULT_AMOUNT_FORMATS=81

* Fixed lookupPubmed test

---------

Co-authored-by: milanmajchrak <milan.majchrak@dataquest.sk>
Co-authored-by: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com>

* Removed not defined search options. (#337)

* browse - Updated IT according to updated cfg (#339)

* Removed not defined search options.

* Updated IT according to a cfg updates.

* enable different endpoint to S3 bitstorage (#338)

* enable different endpoint to S3 bitstorage

* modified tests

* Migrate to 7.5 (#274)

* 97298: Self-register - test fixes

* 97298: Self-register - test fixes

* [CST-7756] Rename type property to subscriptionType in the subscriptionType object

* [CST-7756] Fix checkstyle

* [CST-7756] fixed database scripts version number

* [CST-7754] otherworkspace discovery configuration shows only supervised workspace items, when a supervision order is deleted grants given to supervision groups on an item are revoked.

* [CST-7754] test supervision order is deleted if workspaceItem or group is deleted.

* 97183 Processing PR review feedback

* 97538: Unauthorized tests should now be anonymous

* 97538: Remove readability change

* 97538: Remove readability change in IT

* 97414 Advanced workflow actions: implemented feedback on SelectReviewerAction + WorkflowActionRestRepositoryIT

* 97414 Advanced workflow actions: fixed SelectReviewerAction NullPointerException

* [CST-7604] Configuration updated to highlight Orgunit and Person

* 97735: Add a accept range cors header

* Fix license issues

* 98345 Advanced workflow actions - Parse select reviewers step

* 98345 SelectReviewerAction, TaskRestRepositoriesIT and h2 migration

* 98433 Reject button mostly works - still triggers a 404 in console though

* 98434: Advanced workflow - refactor scoreReview workflow

* 98434: IT fix

* 98433: Refactoring SingleUserReviewAction & general refactoring in Actions
- Fix in AutoAssignAction that selected reviewer didn't get registered as new InProgressSubmissionUser

* 98433: IT fixes now that access rights are now moved to selected reviewers in AutoAssignAction

* [CST-7756] removed unused param

* 98462: Use discovery configurations in browse

* [DURACOM-113] add jfif extension on bitstream formats

* 98462: Refactor change and add admin tests

* 97538: The search rest method should be public

* 97538: Alter IT for public vocabulary search method

* 97183 Tests for findItemsWithEdit and countItemsWithEdit methods of ItemServiceImpl

* 97080: #8613 - Doc for the prefix solr field

* Implemented community feedbacks

* 97425: Fix issue with sessions null value

* 97061: type request param name change to avoid confusion with rest object type &
error codes endpoint changes + IT:
- missing/wrong query param accountRequestType => 400 bad request
- email not valid domain => 422 unprocessable entity

* [CST-7756] refactoring & added missing JavaDoc

* [CST-7756] removed unused service bean

* [CST-7756] minor refactoring  according to the rest contract

* PR #8619: Removed dependency spring-context-support, not needed in main

* [CST-7756] fixed failed tests

* [CST-7756] refactoring

* [CST-7756] added tests to valid subscription parameters

* [CST-7756] added validation logic of params

* [CST-7756] renamed some methods & class

* [CST-7756] minor fix

* [CST-7756] refactored CanSubscribeFeatureIT

* 97425: Implement feedback

* [CST-7756] minor update

* [CST-7756] added missing index field

* [CST-7756] added template for subscription content email

* [CST-7754] removed old code of supervision orders
added a new migration script sql
tested that supervisors can edit only workspace items

* [CST-7756] refactoring

* Remove statusFilter added to Solr browse indexes queries to solve an issue with the local administrators navigation

* [CST-7756] monor fix

* [CST-7756] added unit tests covering methods with business logic

* [CST-7756] sub-daily command and its referred class removed, as subscriptions are sent by subscription-send command

* [CST-7756] updated license header

* 97425: Fix minor issues

* [CST-7756] added instructions to migrate subscriptions from previous versions

* [CST-7756] after merge checkstyle fix

* [CST-7756] extended abstract test

* [CST-7756] updated script

* 99053: Add return_to_pool option to all ProcessingAction except SingleUserReviewAction

* Reinstate config accidentally deleted, added in 30f923a080aa0d927036e0eae609c3bf1a273d35 (#8064) - enables RSS/Atom feeds

* [CST-7756] removed subscriptions for items

* [CST-7756] minor fix

* [CST-7756] extended SubscribeServiceTest in order to use service instance with real (h2) database instead of mocks, so that tests actually store, query and remove subscriptions interacting with database

* [CST-7756] added missing JavaDoc

* [CST-7756] code refactoring

* [CST-7756] renamed test class in order to reflect its actual behavior

* [CST-7756] removed mail template used by previous script

* [CST-7756] code refactoring

* [CST-7756] removed Items section

* [CST-7756] added missing IT

* [CST-7754] updated javadoc

* [CST-7754] updated comment

* [CST-7754] withdrawn item should not allow supervision order

* [CST-7754] moved supervision orders test on workflow items to SupervisionOrderRestRepositoryIT, added test covering the scenario when an admin tries to set a supervision order on a withdrawn item, and when an admin sets a supervision order on a workflow item before sending it back to workspace: supervisor can edit the item only when it goes to workspace status.

* [TLC-380] Browse links and "by regex" links in item display

* [TLC-380] Fix checkstyle and duplicate code

* [TLC-380] Further checkstyle fixes

* [TLC-380] Further checkstyle fixes

* [TLC-380] Refactor browses endpoint for browse link usage

* [TLC-249] Improve 'findByFields' browse refactor

* [TLC-380] Fix browse resource byFields IT

* [TLC-380] Remove unused methods, add ITs

* #8629: Make sure temporary worfklow groups of reviewers get deleted

* #8629: PR feedback refactor

* [CST-7756] implemented community feedbacks

* [CST-7756] added test that proves what happens if an object is access restricted after you have a subscription to it.

* [CST-7756] renamed a method

* [CST-7756] updated subscriptions migration scripts

* [CST-7756] removed 'lastModified_dt' index field

* [CST-7756] minor refactoring

* [CST-7756] added email subject

* [CST-7756] added dissemination for generic DSpace Item

* [CST-7756] If no crosswalk is defined for the Item's entity type, default generic Item one is applied

* IT fix: ReviewManagers repository wide group, not collection workflow group

* Test IT without drop constraint

* [CST-7756] restores security check as was originaly

* [CST-7756] described beans

* #8628: Remove GET shortlivedtokens endpoint & related IT

* [TLC-249] Show Identifier Step, pre-register identifiers

* [TLC-249] Remove unused import in WorkspaceItemServiceImpl

* [TLC-249] Update section count test in SubmissionDefinitionsControllerIT

* [TLC-249] Refactor to support better filter usage, PENDING and MINTED status

* [TLC-249] Add and expose config for enabling register DOI

* [TLC-249] REST backend for identifier config

* [TLC-249] Better status return for new DOIs, write new integration tests

* [TLC-249] Integration tests, keep GET handling in controller

* [TLC-249] Move GET handling back to ItemIdentifierController

* [TLC-249] Checkstyle fixes

* [TLC-249] Licence header fixes

* [TLC-249] Further checkstyle fixes

* [TLC-249] Fix tests, Refactor things to use a LinkRestRepository for GET, Controller for POST

* [TLC-249] Further IT fix for identifiers

* [TLC-249] Licence header fix

* [TLC-249] Address review feedback

Controller updated to be less DOI-specific in its
registration implementation
item-status.register renamed to registerDOI
display types included in section data, for UI hints
comments / javadoc added
DOI status text sent instead of number in status data

As per tdonohue's revew on 2022-01-18

* [TLC-249] Lint fixes

* [TLC-249] Improve model for identifier step data

* [TLC-249] Update configuration identifiers.cfg

* [TLC-249] Remove unused subclass DataIdentifier

* [TLC-249] Update identifier section IT

* [TLC-249] Update integration tests for identifier controller

* [TLC-249] Fix submission controller IT

* [TLC-249] Update canRegisterDOIFeature to check for cfg enabled

* [TLC-249] Refactor identifiers create endpoint

* [TLC-249] Refactor, include controller 'find DSO' operation

* [TLC-249] Throw not implemented for findOne and findAll

* [TLC-249] Fixes and improvements as per review feedback

* [TLC-249] Checkstyle fix

* [TLC-249] return value  as id for IdentifierRest

* [TLC-249] Fix category type in IdentifierRest

* [TLC-249] Update integration tests for IdentifierRestRepository

* [TLC-249] Refactor TrueFilter to get instantiated as singleton

* [TLC-249] Construct canonical handle URL in identifier item link

* [TL-249] Remove example-doi_filter from config, add singleton attr to TrueFilter

* [TL-249] Add always_true_filter to test REST identifier-service.xml config

* [TL-249] Add identifiers.cfg and item-filters.xml config to test data

* [TL-249] Fix imports

* [TL-249] Revert accidental commit to RestResourceController

* [TL-249] Javadoc and other small fixes, DOI unit tests

* [TL-249] Javadoc and other small fixes

Including stripping $Revision$ from filter javadoc.

* [TL-249] Checkstyle fix

* 99200: Delete items after copies have been requested fix

* [CST-7756] added security check into 'subscription-send' script

* Alternate way to restart workflow in case of decline

* Fix for decline when the delete doesn't persist in context before wfi is created again from same item

* [CST-7754] supervising user can perform operations on Workspace item only if they have proper permissions

* [DURACOM-116] process sorted alphabetically

* [TLC-249] Test abandoning of a pending DOI and minting afterwards

* [TLC-249] Ensure property identifiers.item-status.register-doi is set

* Added missing commit in cleanup method

* Update BitstreamStorageServiceImpl.java

Amend commit log message

* [CST-7756] Non-Discoverable and withdrawn items must be excluded from the notification list

* [DURACOM-116] moved sorting to service

* removed the log info

* CST-8936 fix permission for bitstream generated by media-filter

* Updates to LICENSES_THIRD_PARTY for 7.5

* [maven-release-plugin] prepare release dspace-7.5

* Fixed some compile errors

* Fixed some compile errors

* Fixed some compile errors

* Fixed errors which causes tomcat starting errors

* Ignored failing test

* Fixed MetadataExportSearchIT - the dateIssued search filter was commented out.

* Added a new action which push test image for FE integration tests.

* Updated creating of the docker

* changed to proper dependency

* Updated cfg, fixed error because rest.properties.exposed was defined in two configuration files.

* fixed cfg for tests

* Copied fixes for the PRs: 277, 279, 281, 273, 284, 286, 296, 300, 308

* Push docker only to migrate-to-7.5 and not to dtq-dev-7.5

* Update migrate-docker.yml

Updated docker action name

* Updated IT test for Shibboleth auth

* Copied ClarinLicenseImportRestController from another branch

* Shibboleth autologin error solved - new header must be added into Allowed Headers in the Application.java

* Fixed checkstyle issues.

* Internal/fix integration tests 75 (#311)

* trying action with different ref

* fixed checkstyle

* updated config, fixed several integration tests

* removed old zip file

* assurance

* dspace.ui.url was changed to http://localhost:4000

* internal/fix-another-integration-tests (#312)

* Set Default charset to UTF-8 in Integration tests

* Fixed test in the ExternalHandleRestRepositoryIT - problem was with encoding

* Fixed WorkspaceItemRestRepositoryIT#patchRejectLicenseTest - the configuration property that disable LicenseValidation was set to false.

* Fixed ClarinDiscoveryRestControllerIT.java#discoverFacetsDateTestWithLabels
FacetEntryMatcher.dateIssuedFacet(false), was missing

* Fixed ClarinDiscoveryRestControllerIT.java#discoverSearchObjectsTestWithBasicQuery missing FacetEntryMatcher.dateIssuedFacet(false),

* Fixed ClarinDiscoveryRestControllerIT tests by updating the discovery.xml

* Fixed MetadataExportSearchIT.exportMetadataSearchFilterDate - commented out the test for Date Issued date search filter which was removed from the discovery.xml

* test  (#317)

* Initial commit

* Fixed SystemWideAlertRestRepositoryIT - wrong Date comparing, the fix was copied from the upstream

* Copied fix from the upstream

* Enabled distribution license validation.

* Update build.yml

Added -fae to integration tests

* Removed unnecessary check

* Revert to DEFAULT_AMOUNT_FORMATS=81

* Fixed lookupPubmed test

---------

Co-authored-by: milanmajchrak <milan.majchrak@dataquest.sk>
Co-authored-by: milanmajchrak <90026355+milanmajchrak@users.noreply.github.com>

* enable different endpoint to S3 bitstorage (#338)

* enable different endpoint to S3 bitstorage

* modified tests

---------

Co-authored-by: Marie Verdonck <maria.verdonck@atmire.com>
Co-authored-by: Giuseppe Digilio <giuseppe.digilio@4science.it>
Co-authored-by: corrado lombardi <corrado.lombardi@4science.com>
Co-authored-by: Mohamed Saber Eskander <mohamed.eskander@4science.com>
Co-authored-by: Koen Pauwels <koen.pauwels@atmire.com>
Co-authored-by: Jens Vannerum <jens.vannerum@atmire.com>
Co-authored-by: jensroets <jens.roets@atmire.com>
Co-authored-by: Yana De Pauw <yana@atmire.com>
Co-authored-by: Tim Donohue <tim.donohue@lyrasis.org>
Co-authored-by: jensvannerum <78496674+jensvannerum@users.noreply.github.com>
Co-authored-by: Mykhaylo <michele.boychuk@gmail.com>
Co-authored-by: Francesco Pio Scognamiglio <francescopio.scognamiglio@4science.it>
Co-authored-by: Nona Luypaert <nona.luypaert@atmire.com>
Co-authored-by: Toni Prieto <antonio.juan.prieto@upc.edu>
Co-authored-by: Alexandre Vryghem <alexandre@atmire.com>
Co-authored-by: Kim Shepherd <kim@shepherd.nz>
Co-authored-by: Pascal-Nicolas Becker <dspace@pascal-becker.de>
Co-authored-by: Agustina Martinez <am857@cam.ac.uk>
Co-authored-by: Raf Ponsaerts <raf.ponsaerts@atmire.com>
Co-authored-by: Andrea Bollini <andrea.bollini@4science.it>
Co-authored-by: MajoBerger <marian.berger@dataquest.sk>
Co-authored-by: MajoBerger <88670521+MajoBerger@users.noreply.github.com>

* Copied fix from 303

* Copied fix from 302, 319, 314

* Copied fix from 331

* Copied fix from 295

* Copied fix from 337, 339

* Removed ClarinLicenseImportRestController.java according to 273

* Eperson.hasPasswordSet was missing and one checkstyle violation as occurred.

* Docker image should be generated.

* Temp file

* Migrate to 7.5 (#343)

* 97298: Self-register - test fixes

* [CST-7756] Rename type property to subscriptionType in the subscriptionType object

* [CST-7756] Fix checkstyle

* [CST-7756] fixed database scripts version number

* [CST-7754] otherworkspace discovery configuration shows only supervised workspace items, when a supervision order is deleted grants given to supervision groups on an item are revoked.

* [CST-7754] test supervision order is deleted if workspaceItem or group is deleted.

* 97183 Processing PR review feedback

* 97538: Unauthorized tests should now be anonymous

* 97538: Remove readability change

* 97538: Remove readability change in IT

* 97414 Advanced workflow actions: implemented feedback on SelectReviewerAction + WorkflowActionRestRepositoryIT

* 97414 Advanced workflow actions: fixed SelectReviewerAction NullPointerException

* [CST-7604] Configuration updated to highlight Orgunit and Person

* 97735: Add a accept range cors header

* Fix license issues

* 98345 Advanced workflow actions - Parse select reviewers step

* 98345 SelectReviewerAction, TaskRestRepositoriesIT and h2 migration

* 98433 Reject button mostly works - still triggers a 404 in console though

* 98434: Advanced workflow - refactor scoreReview workflow

* 98434: IT fix

* 98433: Refactoring SingleUserReviewAction & general refactoring in Actions
- Fix in AutoAssignAction that selected reviewer didn't get registered as new InProgressSubmissionUser

* 98433: IT fixes now that access rights are now moved to selected reviewers in AutoAssignAction

* [CST-7756] removed unused param

* 98462: Use discovery configurations in browse

* [DURACOM-113] add jfif extension on bitstream formats

* 98462: Refactor change and add admin tests

* 97538: The search rest method should be public

* 97538: Alter IT for public vocabulary search method

* 97183 Tests for findItemsWithEdit and countItemsWithEdit methods of ItemServiceImpl

* 97080: #8613 - Doc for the prefix solr field

* Implemented community feedbacks

* 97425: Fix issue with sessions null value

* 97061: type request param name change to avoid confusion with rest object type &
error codes endpoint changes + IT:
- missing/wrong query param accountRequestType => 400 bad request
- email not valid domain => 422 unprocessable entity

* [CST-7756] refactoring & added missing JavaDoc

* [CST-7756] removed unused service bean

* [CST-7756] minor refactoring  according to the rest contract

* PR #8619: Removed dependency spring-context-support, not needed in main

* [CST-7756] fixed failed tests

* [CST-7756] refactoring

* [CST-7756] added tests to valid subscription parameters

* [CST-7756] added validation logic of params

* [CST-7756] renamed some methods & class

* [CST-7756] minor fix

* [CST-7756] refactored CanSubscribeFeatureIT

* 97425: Implement feedback

* [CST-7756] minor update

* [CST-7756] added missing index field

* [CST-7756] added template for subscription content email

* [CST-7754] removed old code of supervis…
  • Loading branch information
27 people committed Jun 19, 2024
1 parent ae542da commit 69363f8
Show file tree
Hide file tree
Showing 11 changed files with 150 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,4 @@ jobs:
--request POST \
https://api.github.com/repos/dataquest-dev/\
dspace-angular/actions/workflows/deploy.yml/dispatches \
--data "{\"ref\":\"refs/heads/dtq-dev-7.5\"}"
--data "{\"ref\":\"refs/heads/dtq-dev\"}"
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,10 @@ private String getItemIdentifier(Item item) {
public void trackBitstreamDownload(Context context, HttpServletRequest request, Bitstream bit) throws SQLException {
// We only track a download request when serving a request without Range header. Do not track the
// download if the downloading continues or the tracking is not allowed by the configuration.
if (StringUtils.isNotBlank(request.getHeader("Range")) &&
BooleanUtils.isFalse(configurationService.getBooleanProperty("matomo.track.enabled"))) {
if (StringUtils.isNotBlank(request.getHeader("Range"))) {
return;
}
if (BooleanUtils.isFalse(configurationService.getBooleanProperty("matomo.track.enabled"))) {
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,25 @@
/* Created for LINDAT/CLARIN */
package org.dspace.authenticate.clarin;

import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

/**
* Helper class for request headers.
* Class is copied from UFAL/CLARIN-DSPACE (https://github.com/ufal/clarin-dspace) and modified by
* @author Milan Majchrak (milan.majchrak at dataquest.sk)
*/
public class Headers {

private static final Logger log = LogManager.getLogger(org.dspace.authenticate.clarin.Headers.class);
// variables
//

Expand Down Expand Up @@ -56,7 +61,7 @@ public void initialise(HttpServletRequest request, String header_separator, List
List<String> vals = new ArrayList<String>();
Enumeration e_vals = request.getHeaders(key);
while (e_vals.hasMoreElements()) {
String values = (String)e_vals.nextElement();
String values = updateValueByCharset((String) e_vals.nextElement());
vals.addAll( header2values(values) );
}

Expand Down Expand Up @@ -149,4 +154,20 @@ private List<String> header2values(String header) {

return values;
}


/**
* Convert ISO header value to UTF-8
* @param value ISO header value String
* @return
*/
private String updateValueByCharset(String value) {
try {
return new String(value.getBytes("ISO-8859-1"), "UTF-8");
} catch (UnsupportedEncodingException ex) {
log.warn("Failed to reconvert shibboleth attribute with value ("
+ value + ").", ex);
}
return value;
}
}
3 changes: 3 additions & 0 deletions dspace-api/src/test/data/dspaceFolder/config/local.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -272,3 +272,6 @@ authority.controlled.dspace.object.owner = true
# Configuration required for thorough testing of browse links
webui.browse.link.1 = author:dc.contributor.*
webui.browse.link.2 = subject:dc.subject.*

# If the versioning is disabled Versioning Integration Tests will fail - allow it for the tests
versioning.enabled=true
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import java.io.IOException;
import java.sql.SQLException;
import java.util.List;
import java.util.function.Predicate;
import javax.servlet.Filter;

import org.dspace.app.rest.filter.DSpaceRequestContextFilter;
Expand Down Expand Up @@ -39,6 +40,8 @@
import org.springframework.lang.NonNull;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.security.web.firewall.HttpFirewall;
import org.springframework.security.web.firewall.StrictHttpFirewall;
import org.springframework.web.context.request.RequestContextListener;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
Expand Down Expand Up @@ -167,6 +170,23 @@ protected LinkRelationProvider dspaceLinkRelationProvider() {
return new DSpaceLinkRelationProvider();
}

/**
* StrictHttpFirewall doesn't allow ISO header values by default. It could throw an error during Shibboleth
* authentication if the user has UTF-8 characters in the name.
* Updated allowedHeaderValues without any regex - it allows every character.
* @return
*/
@Bean
public HttpFirewall allowUrlEncodedSlashHttpFirewall() {
StrictHttpFirewall firewall = new StrictHttpFirewall();
Predicate<String> test = (s) -> {
return true;
};

firewall.setAllowedHeaderValues(test);
return firewall;
}

@Bean
public WebMvcConfigurer webMvcConfigurer() {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ public class ClarinShibbolethLoginFilter extends StatelessLoginFilter {

public static final String VERIFICATION_TOKEN_HEADER = "Verification-Token";

private static final Logger log = LogManager.getLogger(org.dspace.app.rest.security.ShibbolethLoginFilter.class);
private static final Logger log = LogManager.getLogger(org.dspace.app.rest.security.clarin.
ClarinShibbolethLoginFilter.class);

/**
* Property which handles information if the IdP send required information.
Expand Down Expand Up @@ -176,6 +177,11 @@ public Authentication attemptAuthentication(HttpServletRequest req,
}
}

// logging
log.info("Shib-Identity-Provider: " + idp);
log.info("authentication-shibboleth.netid-header: " + netidHeader + " with value: " + netid);
log.info("authentication-shibboleth.email-header: " + emailHeader + " with value: " + email);

try {
if (StringUtils.isEmpty(netid) || StringUtils.isEmpty(idp)) {
log.error("Cannot load the netid or idp from the request headers.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -458,4 +458,35 @@ public void testRedirectToGivenUntrustedUrl() throws Exception {
.header("SHIB-NETID", NET_ID_TEST_EPERSON))
.andExpect(status().isBadRequest());
}

@Test
public void testUTF8ShibHeaders() throws Exception {
// NOTE: The initial call to /shibboleth comes *from* an external Shibboleth site. So, it is always
// unauthenticated, but it must include some expected SHIB attributes.
// SHIB-MAIL attribute is the default email header sent from Shibboleth after a successful login.
// In this test we are simply mocking that behavior by setting it to an existing EPerson.
String token = getClient().perform(get("/api/authn/shibboleth")
.header("SHIB-MAIL", clarinEperson.getEmail())
.header("Shib-Identity-Provider", IDP_TEST_EPERSON)
.header("SHIB-NETID", NET_ID_TEST_EPERSON)
.header("SHIB-GIVENNAME", "knihovna KůÅ\u0088 test ŽluÅ¥ouÄ\u008Dký"))
.andExpect(status().is3xxRedirection())
.andExpect(redirectedUrl("http://localhost:4000"))
.andReturn().getResponse().getHeader("Authorization");


getClient(token).perform(get("/api/authn/status"))
.andExpect(status().isOk())
.andExpect(jsonPath("$.authenticated", is(true)))
.andExpect(jsonPath("$.authenticationMethod", is("shibboleth")));

getClient(token).perform(
get("/api/authz/authorizations/search/object")
.param("embed", "feature")
.param("feature", feature)
.param("uri", utils.linkToSingleResource(ePersonRest, "self").getHref()))
.andExpect(status().isOk())
.andExpect(jsonPath("$.page.totalElements", is(0)))
.andExpect(jsonPath("$._embedded").doesNotExist());
}
}
45 changes: 45 additions & 0 deletions dspace/config/clarin-dspace.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -174,3 +174,48 @@ statistics.cache-server.uri = http://cache-server.none

##### Importing #####
import.metadata.field.not.update = dc.description.provenance, dc.date.available, dc.date.accessioned, dc.identifier.uri

#------------------------------------------------------------------#
#-------------------------Configure DOI----------------------------#
#------------------------------------------------------------------#

# Credentials used to authenticate against the registration agency:
identifier.doi.user = username
identifier.doi.password = password
# DOI prefix used to mint DOIs. All DOIs minted by DSpace will use this prefix.
# The Prefix will be assigned by the registration agency.
identifier.doi.prefix = 10.5072
# If you want to, you can further separate your namespace. Should all the
# suffixes of all DOIs minted by DSpace start with a special string to separate
# it from other services also minting DOIs under your prefix?
identifier.doi.namespaceseparator = dspace/

##
## Configure XSLT-driven submission crosswalk for DataCite
##
crosswalk.dissemination.DataCite.stylesheet = crosswalks/DIM2DataCite.xsl
crosswalk.dissemination.DataCite.schemaLocation = \
http://datacite.org/schema/kernel-3 \
http://schema.datacite.org/meta/kernel-3/metadata.xsd
crosswalk.dissemination.DataCite.preferList = false
crosswalk.dissemination.DataCite.publisher = My University
#crosswalk.dissemination.DataCite.dataManager = # defaults to publisher
#crosswalk.dissemination.DataCite.hostingInstitution = # defaults to publisher
crosswalk.dissemination.DataCite.namespace = http://datacite.org/schema/kernel-3

# consumer to update metadata of DOIs
event.consumer.doi.class = org.dspace.identifier.doi.DOIConsumer
event.consumer.doi.filters = Item+Modify_Metadata

# Add doi here if you are using org.dspace.identifier.DOIIdentifierProvider to generate DOIs.
# Adding doi here makes DSpace send metadata updates to your doi registration agency.
# Add rdf here, if you are using dspace-rdf to export your repository content as RDF.
# Add iiif here, if you are using dspace-iiif.
event.dispatcher.default.consumers = versioning, discovery, eperson

# Edit Item - Status option
identifiers.item-status.register-doi = false

##### Dataquest URL - sing in the footer #####
themed.by.url = https://www.dataquest.sk/dspace
themed.by.company.name = dataquest s.r.o.
7 changes: 6 additions & 1 deletion dspace/config/dspace.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ identifier.doi.user = username
identifier.doi.password = password

# URL for the DOI resolver. This will be the stem for generated DOIs.
#identifier.doi.resolver = https://doi.org
# identifier.doi.resolver = https://doi.org

# DOI prefix used to mint DOIs. All DOIs minted by DSpace will use this prefix.
# The Prefix will be assigned by the registration agency.
Expand Down Expand Up @@ -1165,6 +1165,11 @@ webui.browse.index.1 = dateissued:item:dateissued
webui.browse.index.2 = author:metadata:dc.contributor.*\,dc.creator:text
webui.browse.index.3 = title:item:title
webui.browse.index.4 = subject:metadata:dc.subject.*:text
# webui.browse.index.5 = publisher:metadata:dc.publisher:text
# webui.browse.index.6 = language:metadata:dc.language.iso:iso_lang
# webui.browse.index.7 = itemtype:metadata:dc.type:text
# webui.browse.index.8 = rights:metadata:dc.rights.label:text


## example of authority-controlled browse category - see authority control config
#webui.browse.index.5 = lcAuthor:metadataAuthority:dc.contributor.author:authority
Expand Down
10 changes: 10 additions & 0 deletions dspace/config/modules/rest.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,16 @@ rest.properties.exposed = dspace.name
rest.properties.exposed = dspace.ui.url
rest.properties.exposed = versioning.item.history.include.submitter
rest.properties.exposed = statistics.cache-server.uri
rest.properties.exposed = themed.by.url
rest.properties.exposed = themed.by.company.name
rest.properties.exposed = identifier.doi.resolver
# TUL
rest.properties.exposed = dspace.ui.url
rest.properties.exposed = versioning.item.history.include.submitter
rest.properties.exposed = statistics.cache-server.uri
rest.properties.exposed = citace.pro.url
rest.properties.exposed = citace.pro.university
rest.properties.exposed = citace.pro.allowed


#---------------------------------------------------------------#
Expand Down
2 changes: 1 addition & 1 deletion dspace/config/spring/api/core-services.xml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
<!-- Matomo statistics -->
<bean class="org.matomo.java.tracking.MatomoTracker">
<!-- TODO change me -->
<constructor-arg value="http://dev-5.pc:8135/matomo.php"/>
<constructor-arg value="http://url:port/matomo.php"/>
</bean>
<bean class="org.dspace.app.statistics.clarin.ClarinMatomoBitstreamTracker"/>
<bean class="org.dspace.app.statistics.clarin.ClarinMatomoOAITracker"/>
Expand Down

0 comments on commit 69363f8

Please sign in to comment.