Commit Graph

11017 Commits

Author SHA1 Message Date
Ben Bosman
8ae365724d updated for schema.org metadata 2019-06-06 10:57:06 +02:00
Ben Bosman
3290c49f48 Squashed commit of the following:
commit 182b9db8784b7c98f629d04ae91ca19abdd2cc71
Author: Ben Bosman <ben@atmire.com>
Date:   Wed Jun 5 17:35:15 2019 +0200

    whitespace fixes

commit ffce348b698b96c47995d962a5892566cd317e1e
Author: Ben Bosman <ben@atmire.com>
Date:   Wed Jun 5 17:31:14 2019 +0200

    whitespace fixes

commit a1aeb273ff598305609013f82afd7126e2286f07
Author: Ben Bosman <ben@atmire.com>
Date:   Wed Jun 5 16:58:33 2019 +0200

    merging https://github.com/DSpace/DSpace/pull/2116

commit e89ace0c3cdb5c28c3d59bab6334c514513667d5
Merge: 568aa0d5c a7a8545cd
Author: Ben Bosman <ben@atmire.com>
Date:   Wed Jun 5 16:56:35 2019 +0200

    Merge remote-tracking branch 'community/master' into w2p-62610_metadata-schema-registries-for-entity-types-squashed

    # Conflicts:
    #	dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseRegistryUpdater.java

commit 568aa0d5c9ea86cb31bf825f330a5e4c044a1653
Author: Ben Bosman <ben@atmire.com>
Date:   Wed Jun 5 14:57:20 2019 +0200

    configuring dates as date facets

commit 6390487d45a8e83e02d1e312ced319ed59525377
Author: Ben Bosman <ben@atmire.com>
Date:   Wed Jun 5 12:08:45 2019 +0200

    updated for schema.org metadata - removed collection mapping

commit 171ee9b201eabfa74d2375ef1e0fdba2ea85c404
Author: Ben Bosman <ben@atmire.com>
Date:   Wed Jun 5 12:03:54 2019 +0200

    Squashed commit of the following:

    commit 25fac292281741afe3eb8c7fad5cfff91965461d
    Author: Ben Bosman <ben@atmire.com>
    Date:   Tue Jun 4 13:34:58 2019 +0200

        updated for schema.org metadata

    commit c62fcb75e7ac21f3dc41aa34bed597a4d701e932
    Author: Raf Ponsaerts <raf.ponsaerts@atmire.com>
    Date:   Tue Jun 4 11:46:51 2019 +0200

        [Task 62732] updated the virtual-metadata config

    commit 9ade3f90c011a04e6eb79d91d0f82cc305f941dd
    Author: Ben Bosman <ben@atmire.com>
    Date:   Tue Jun 4 11:35:46 2019 +0200

        discovery config update

    commit eef08d7617be5ead9626829b0320bcb610d8cb40
    Author: Ben Bosman <ben@atmire.com>
    Date:   Mon Jun 3 15:12:59 2019 +0200

        new types for entities

    commit 434722b809cab29ff8e3b95eb04ed644008afc38
    Author: Ben Bosman <ben@atmire.com>
    Date:   Mon Jun 3 14:55:05 2019 +0200

        restored eperson types

    commit ef97353de6a9c07e91d4680cb9b1e5fb539b94d7
    Author: Marie Verdonck <maria.verdonck@atmire.com>
    Date:   Wed May 29 16:28:12 2019 +0200

        Discovery config for entities Organization; PublicationIssue;
           PublicationVolume; Periodical

        Signed-off-by: Marie Verdonck <maria.verdonck@atmire.com>

    commit 2c02d863c66174917bcf4309f370e5c2d56f4260
    Author: Ben Bosman <ben@atmire.com>
    Date:   Tue May 28 18:52:46 2019 +0200

        journal volume name

    commit ceb5a2d34fed3647f92997b6a0b1f06b34cdfa7c
    Author: Ben Bosman <ben@atmire.com>
    Date:   Tue May 28 18:10:20 2019 +0200

        sort by date accessioned

    commit 62751138875b130d3c512453199e0ba5b4a9451f
    Author: Marie Verdonck <maria.verdonck@atmire.com>
    Date:   Tue May 28 15:40:22 2019 +0200

        Discovery configuration for Person Entity

    commit 62622ccbc66bbebc4a297b216507461f3a1f37de
    Author: Marie Verdonck <maria.verdonck@atmire.com>
    Date:   Tue May 28 14:25:18 2019 +0200

        Submission-forms changed for new metadata mapping
        - Not yet mapped with replacement fields commented

    commit 2f6338d1e85352097f398281685e7800e00a5e87
    Author: Ben Bosman <ben@atmire.com>
    Date:   Tue May 28 11:07:48 2019 +0200

        fixes to submission forms

    commit 9aeebf61a8e180e3ee6b90001385eae3d7921f35
    Author: Ben Bosman <ben@atmire.com>
    Date:   Tue May 28 11:02:54 2019 +0200

        fixes to submission forms

    commit 9055ae6d8ed4b686c879853ea8ca761950d27f87
    Author: Marie Verdonck <maria.verdonck@atmire.com>
    Date:   Tue May 28 10:47:31 2019 +0200

        Equivalents found in dublin-core-types, list so far:
        * person-types.xml & eperson-types.xml > schema-person-types.xml
            * eperson.firstname > person.givenName
            * eperson.lastname > person.familyName
            * eperson.phone > persone.telephone
            * eperson.language > person.knowsLanguage
            * person.identifier.email > person.email
            * person.identifier.orcid > NOT FOUND
            * person.identifier.birthdate > person.birthDate
            * person.identifier.staffid > NOT FOUND
            * person.identifier.jobtitle > person.jobTitle
            * person.contributor.other > NOT FOUND
        * journalVolume-types.xml > schema-publicationVolume-types.xml
            * journalvolume.issuedate > creativework.datePublished
            * journalvolume.identifier.volume > publicationVolume.volumeNumber
            * journalvolume.identifier.name > NOT FOUND
            * journalvolume.identifier.description > dc.description
        * orgunit-types.xml > schema-organization-types.xml
            * orgunit.identifier.name > organization.legalName
            * orgunit.identifier.id > NOT FOUND
            * orgunit.identifier.dateestablished >organisation.foundingDate
            * orgunit.identifier.city > organisation.address.addressLocality
            * orgunit.identifier.country > organisation.address.addressCountry
            * orgunit.identifier.description > dc.description
        * project-types.xml > schema-project-types.xml

        ‘Project’ is still in ‘Pending’ https://pending.schema.org/
            * project.identifier.name > dc.title
            * project.identifier.id > dc.identifier
            * project.identifier.status > NOT FOUND
            * project.identifier.startdate > NOT FOUND
            * project.identifier.expectedcompletion > NOT FOUND
            * project.identifier.keyword > dc.subject
            * project.identifier.description > dc.description
            * project.contributor.other > dc.contributor.other
            * project.contributor.author > dc.contributor.author
        * journalissue-types.xml > schema-publicationIssue-types.xml
            * journalissue.issuedate > creativework.datePublished
            * journalissue.identifier.number > publicationissue.issueNumber
            * journalissue.identifier.name > dc.title
            * journalissue.identifier.description > dc.description
            * journalissue.identifier.keyword > creativework.keywords
        * journal-types > schema-periodical-types.xml
            * journal.contributor.editor > creativework.editor
            * journal.publisher > creativework.publisher
            * journal.identifier.issn > creativeworkseries.issn
            * journal.identifier.name > dc.title
            * journal.identifier.description > dc.description
            * journal.title > NOT FOUND

    commit 1578da3a76fa29567a63e64b587898a24004dbf4
    Author: Marie Verdonck <maria.verdonck@atmire.com>
    Date:   Mon May 27 15:38:54 2019 +0200

        Metadata registries for entity types (partially) mapped and replaced by schema.org values
        Non-mapped values logged in new files
        - person-types.xml & eperson-types.xml > schema-person-types.xml
        - journalVolume-types.xml > schema-publicationVolume-types.xml
        - orgunit-types.xml > schema-organization-types.xml
        - project-types.xml > schema-project-types.xml
        - journalissue-types.xml > schema-publicationIssue-types.xml
        - journal-types > schema-periodical-types.xmlnon-direct parent thing.name)
2019-06-05 17:45:08 +02:00
benbosman
a7a8545cd5 Merge pull request #2116 from mwoodiupui/DS-3953
[DS-3953] Externalize hard-coded list of metadata registry files in updater
2019-06-05 16:52:24 +02:00
Kevin Van de Velde
8d97f23375 [DS-4266] CRUD support for bitstream formats: Code style cleanup 2019-06-05 11:46:00 +02:00
Marie Verdonck
6a65cd2ad3 Error handling and cleanup:
- setAllValuesOfRest() SQLException now meaningful message
- metadataConverter never used, so removed
- id comparison check flipped so no NullPointer when no id in json in body,
but meaningful message
2019-06-04 13:15:20 +02:00
Marie Verdonck
f3cfe49a97 Removing non-code changes (indentation) 2019-06-04 10:35:55 +02:00
Mark H. Wood
55dbcb96cd [DS=3953] Configuration comment to explain how these properties are used. 2019-06-02 08:25:25 -04:00
Mark H. Wood
b6eb0b7d85 Merge branch 'DS-3953' of github.com:mwoodiupui/DSpace into DS-3953 2019-06-02 08:19:40 -04:00
Marie Verdonck
1f40ae51ad 400 - DSpaceBadRequestException when nonvalid supportLevel in rest call for
POST /api/core/bitstreamformats
PUT /api/core/bitstreamformats/<:id>

Implementation & Tests for create/update
2019-05-31 15:32:16 +02:00
Raf Ponsaerts
db8f203f01 [DS-4217] fixed compilation failure after rebase and wrote tests for the DSpaceBadRequestException
Signed-off-by: Marie Verdonck <maria.verdonck@atmire.com>
2019-05-31 15:00:43 +02:00
Raf Ponsaerts
d6b5abd694 [DS-4217] applied the name refactor and rewrote BadRequestException to use this class instead
Signed-off-by: Marie Verdonck <maria.verdonck@atmire.com>
2019-05-31 15:00:19 +02:00
Marie Verdonck
15f6f9e9b8 Tests for full CRUD functionality on bitstreamformat registry endpoint:
POST /api/core/bitstreamformats
PUT /api/core/bitstreamformats/<:id>
DELETE /api/core/bitstreamformats/<:id>

Signed-off-by: Marie Verdonck <maria.verdonck@atmire.com>
2019-05-31 14:50:52 +02:00
Marie Verdonck
44f8a8ef9f Thown sql exception with message & checkstyle 2019-05-31 14:49:59 +02:00
Marie Verdonck
c79006dca1 unused import, checkstyle violation 2019-05-31 14:49:12 +02:00
Marie Verdonck
e4f1ed698a comments removed & if supportlevel is -1 (not given), set to UNKNOWN 2019-05-31 14:48:29 +02:00
Marie Verdonck
198b97de6d getSupportLevelString removed and usage replaced with getSupportLevelText 2019-05-31 14:47:05 +02:00
Marie Verdonck
47ece82445 Codechanges ignoring whitespaces and empty lines of following commits:
Squashed commit of the following:

commit d65609c
Author: Ben Bosman <ben@atmire.com>
Date:   Thu May 30 11:18:46 2019 +0200

    travis build fixes

commit 62aeb94
Author: Ben Bosman <ben@atmire.com>
Date:   Thu May 30 10:53:48 2019 +0200

    license broken

commit 1d2e2ed
Author: Ben Bosman <ben@atmire.com>
Date:   Thu May 30 10:33:54 2019 +0200

    update comments

commit 552005f
Author: Ben Bosman <ben@atmire.com>
Date:   Thu May 30 10:22:31 2019 +0200

    removed unnecessary method

commit af149e7
Author: Marie Verdonck <maria.verdonck@atmire.com>
Date:   Wed May 29 17:47:27 2019 +0200

    Reduced complexity in relationship rest controller & tests (PUT)
    - No need for id integer check, pathvariable expects only integers
    - Tests added for exception cases:
       > Invalid relationship id (non-existent) > 404 - Not found
       > Invalid item id in body > 422 - Unprocesseable
    - Test verification andExpect() more efficient

commit 3c37d20
Author: Marie Verdonck <maria.verdonck@atmire.com>
Date:   Wed May 29 10:43:19 2019 +0200

    Tests for the endpoints: PUT /api/core/relationships/:id/leftItem
                             PUT /api/core/relationships/:id/rightItem

commit a58c611
Author: Marie Verdonck <maria.verdonck@atmire.com>
Date:   Tue May 28 10:18:19 2019 +0200

    Back to original isAllowedToModify method; regex for relationship id in mapping &
    - No need to check for leftItem=rightItem, is allowed
    - No need to check if relationship already exists, DB will prevent duplicates

commit 2424c5c
Author: Marie Verdonck <maria.verdonck@atmire.com>
Date:   Mon May 27 13:53:50 2019 +0200

    Changes in the PUT on relationships, new endpoints:
    - PUT /api/core/relationships/:id/leftItem
    - PUT /api/core/relationships/:id/rightItem

    > 403 Forbidden  - if not enough write rights (see below)
    > 422 Unprocesseable Entity -  if relationship id NaN or invalid item in body
    > 404 Resource Not Found if - relationship with given id not found

    Needed permissions:
    Replace left: right.WRITE OR (left.WRITE AND old-left.WRITE)
    Replace right: left.WRITE OR (right.WRITE AND old-right.WRITE)
2019-05-31 10:14:24 +02:00
Andrea Bollini
eef6055ead Fix wrong cleanup query 2019-05-30 14:55:46 +02:00
Andrea Bollini
b9b0fcd45f Merge branch 'master' of https://github.com/DSpace/DSpace into DS-4252 2019-05-30 14:47:16 +02:00
Ben Bosman
38f1468f42 Squashed commit of the following:
commit d65609c66e4dd54c5a8af2fc18d952c958c0f69b
Author: Ben Bosman <ben@atmire.com>
Date:   Thu May 30 11:18:46 2019 +0200

    travis build fixes

commit 62aeb9463d9c74070540ad1eb247bb539dae8cf9
Author: Ben Bosman <ben@atmire.com>
Date:   Thu May 30 10:53:48 2019 +0200

    license broken

commit 1d2e2edb085433f79aa2abe58cdc4d4065dbfc81
Author: Ben Bosman <ben@atmire.com>
Date:   Thu May 30 10:33:54 2019 +0200

    update comments

commit 552005fc2f1c912220d0f62e94c3045e9f772be2
Author: Ben Bosman <ben@atmire.com>
Date:   Thu May 30 10:22:31 2019 +0200

    removed unnecessary method

commit af149e7871f30e4bc17f7eeccf8655fe9d80cdf7
Author: Marie Verdonck <maria.verdonck@atmire.com>
Date:   Wed May 29 17:47:27 2019 +0200

    Reduced complexity in relationship rest controller & tests (PUT)
    - No need for id integer check, pathvariable expects only integers
    - Tests added for exception cases:
       > Invalid relationship id (non-existent) > 404 - Not found
       > Invalid item id in body > 422 - Unprocesseable
    - Test verification andExpect() more efficient

commit 3c37d208cbe609f5182470ce8302ec25de00939f
Author: Marie Verdonck <maria.verdonck@atmire.com>
Date:   Wed May 29 10:43:19 2019 +0200

    Tests for the endpoints: PUT /api/core/relationships/:id/leftItem
                             PUT /api/core/relationships/:id/rightItem

commit a58c611ad7a648b28933fb39840866def42384e6
Author: Marie Verdonck <maria.verdonck@atmire.com>
Date:   Tue May 28 10:18:19 2019 +0200

    Back to original isAllowedToModify method; regex for relationship id in mapping &
    - No need to check for leftItem=rightItem, is allowed
    - No need to check if relationship already exists, DB will prevent duplicates

commit 2424c5c71b63122263aec08e110cf7bb4b19cc5d
Author: Marie Verdonck <maria.verdonck@atmire.com>
Date:   Mon May 27 13:53:50 2019 +0200

    Changes in the PUT on relationships, new endpoints:
    - PUT /api/core/relationships/:id/leftItem
    - PUT /api/core/relationships/:id/rightItem

    > 403 Forbidden  - if not enough write rights (see below)
    > 422 Unprocesseable Entity -  if relationship id NaN or invalid item in body
    > 404 Resource Not Found if - relationship with given id not found

    Needed permissions:
    Replace left: right.WRITE OR (left.WRITE AND old-left.WRITE)
    Replace right: left.WRITE OR (right.WRITE AND old-right.WRITE)

    Signed-off-by: Marie Verdonck <maria.verdonck@atmire.com>
2019-05-30 11:48:20 +02:00
Marie Verdonck
e3ac8f98b1 Full CRUD on bitstreamformat registry endpoint; added:
POST /api/core/bitstreamformats
PUT /api/core/bitstreamformats/<:id>
DELETE /api/core/bitstreamformats/<:id>

Signed-off-by: Marie Verdonck <maria.verdonck@atmire.com>
2019-05-29 14:36:21 +02:00
Andrea Bollini
970955d722 DS-4210 Fix response code for created object via URI-LIST without further details 2019-05-28 10:55:03 +02:00
Andrea Bollini
ae671d27ab Merge branch 'master' of https://github.com/DSpace/DSpace into DS-4210 2019-05-28 10:52:10 +02:00
Alexander Sulfrian
812b459cf5 HAL: Use submit button in login form
This enables some automatic features of the browsers, f.e. the form will be
submitted when you press the return key in the username or password field.
2019-05-24 18:53:10 +02:00
Alexander Sulfrian
2111d03ffb HAL: Encode username and password in login form 2019-05-24 18:52:57 +02:00
Mark H. Wood
ce03072495 [DS-3823] Explain the existence and use of CacheSnooper. 2019-05-24 08:44:25 -04:00
Mark H. Wood
17daf04f21 [DS-3872] Re-remove factored-out code that was un-removed by a botched rebase. 2019-05-22 13:45:16 -04:00
Mark H. Wood
62acad25a3 [DS-3872] Add many inexplicably missing imports after rebase. 2019-05-22 12:10:14 -04:00
Mark H. Wood
ff5962cfa6 [DS-3872] Make config visible to introspector; enable testing arbitrary templates; remove more MessageFormat. 2019-05-22 11:18:16 -04:00
Mark H. Wood
db8a5effb3 [DS-3872] Avoid collision with other Velocity users by making resources local to the engine instance.
Also misc. clarifications and cleanups, drop unused new method.
2019-05-22 11:18:16 -04:00
Mark H. Wood
a579f8fe92 [DS-3872] Spring Boot looks for Velocity and tries to initialize it as v1. Suppress this. 2019-05-22 11:18:16 -04:00
Mark H. Wood
cb3edadf1f [DS-3872] Load template file into string resource repository, let Velocity figure out how to parse it. 2019-05-22 11:08:05 -04:00
Mark H. Wood
9f7b3e53df [DS-3872] Align commons-lang3 transitive dependencies. 2019-05-22 11:08:05 -04:00
Mark H. Wood
60f72fb90a [DS-3872] Checkstyle fixes lost in rebasing. 2019-05-22 11:08:05 -04:00
Mark H. Wood
d94264bc79 [DS-3872] Support 'charset' header; remove old code I had missed. 2019-05-22 11:08:04 -04:00
Mark H. Wood
66191be2aa [DS-3872] Restore ability to set Subject: from template text. 2019-05-22 11:08:04 -04:00
Mark H. Wood
b75c5e1bab [DS-3872] Convert MessageFormat email templates to VTL. 2019-05-22 11:08:04 -04:00
Mark H. Wood
3bea69ae82 [DS-3872] Upgrade to Velocity v2. 2019-05-22 11:08:04 -04:00
Mark H. Wood
5bfe44f93f Begin patching in Velocity 2019-05-22 11:08:04 -04:00
Tim Donohue
68a068db37 Merge pull request #2435 from tdonohue/fix_broken_IT
Fix race condition in IT on "master"
2019-05-21 12:49:50 -05:00
Tim Donohue
81040975ed Convert Mock into a Spy of currently loaded bean 2019-05-21 12:15:37 -05:00
Tim Donohue
73c2e9d2d6 Merge pull request #2265 from tdonohue/one_webapp_backend_redux
DS-4257: DSpace 7 backend as one webapp (RESTv7, SWORD, SWORDv2, OAI, RDF)
2019-05-21 11:02:58 -05:00
Kevin Van de Velde
e3199d76a7 [DS-4096] Updating owning collections: Additional checks to prevent moving to an items current owning collection and making sure that an item is archived or withdrawn 2019-05-21 09:55:44 +02:00
Raf Ponsaerts
15de4f2901 [DS-4217] fixed compilation failure after rebase and wrote tests for the DSpaceBadRequestException 2019-05-21 09:44:29 +02:00
Raf Ponsaerts
bd63a69d09 [DS-4217] applied the name refactor and rewrote BadRequestException to use this class instead 2019-05-21 09:44:24 +02:00
Marie Verdonck
af13e51d0e Max length of line rule 2019-05-20 12:04:37 +02:00
Marie Verdonck
3aea69f9a7 Reason behind context.commit in RestController 2019-05-20 12:04:01 +02:00
Marie Verdonck
69a392a5cd Better exception/error handling for invalid collection uri in PUT /api/core/items/<:uuid>/owningCollection 2019-05-20 10:47:44 +02:00
Andrea Bollini
4194443185 DS-4252 Discovery re-index doesn't work without -b 2019-05-19 22:45:12 +02:00
Tim Donohue
aebd0f9ce6 [maven-release-plugin] prepare for next development iteration 2019-05-17 15:34:13 -05:00