Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

DD-561 Updated SwordServiceBean to support multi-license #118

Conversation

mderuijter
Copy link

What this PR does / why we need it:
Currently in the multi-license branch edu.harvard.iq.dataverse.api.datadeposit.SwordServiceBean still contains references to CC0. Since CC0 is no longer necessarily the default, or even guaranteed to be an option, the rules should be modified to use the default license instead of CC0.

Which issue(s) this PR closes:

Closes #DD-561

Special notes for your reviewer:
Making a new PR because previous one has a Maven compilation error that does not happen on my development machine.

Suggestions on how to test this:

Tested this with the Sword interface using the example xml from the Dataverse documentation:
Create a Dataset with an Atom entry:
XML

make sure ./deploy-module configure-licenses has been run succesfully

Created a dataset with:

curl -u $(apikey): --data-binary "@/vagrant/shared/swordservicetest.xml" -H "Content-Type: application/atom+xml" 'http://localhost:8080/dvn/api/data-deposit/v1.1/swordv2/collection/dataverse/root'

Test 1
<dcterms:license>Custom License</dcterms:license>
<dcterms:rights>Downloader will not use the Materials in any way prohibited by applicable laws.</dcterms:rights>

Test 2 (results in error like it should)
<dcterms:license>CC0-1.0</dcterms:license>
<dcterms:rights>Downloader will not use the Materials in any way prohibited by applicable laws.</dcterms:rights>

Test 3
<dcterms:license>CC0-1.0</dcterms:license>

Test 4 (results in error)
<dcterms:license></dcterms:license>

Test 5 results in the default license
no dcterms specified

@janvanmansum janvanmansum merged commit 60cb2ea into DANS-KNAW:multi-license Sep 15, 2021
PaulBoon pushed a commit to PaulBoon/dataverse that referenced this pull request Sep 21, 2021
PaulBoon pushed a commit to PaulBoon/dataverse that referenced this pull request Sep 21, 2021
PaulBoon pushed a commit to PaulBoon/dataverse that referenced this pull request Sep 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants