hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 10:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9634 from tdonohue/port_9625_to_7x

Browse Source 
[Port dspace-7_x] updates creativecommons.org links to https
This commit is contained in:
Tim Donohue
2024-06-05 12:01:26 -05:00
committed by GitHub
parent a95ed84b75 c5d139c9e1
commit 3ad22bf977
7 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseAddPatchOperation.java
View File

@@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* Example: <code> * Example: <code>
* curl -X PATCH http://${dspace.server.url}/api/submission/workspaceitems/31599 -H "Content-Type: * curl -X PATCH http://${dspace.server.url}/api/submission/workspaceitems/31599 -H "Content-Type:
* application/json" -d '[{ "op": "add", "path": "/sections/cclicense/uri", * application/json" -d '[{ "op": "add", "path": "/sections/cclicense/uri",
* "value":"http://creativecommons.org/licenses/by-nc-sa/3.0/us/"}]' * "value":"https://creativecommons.org/licenses/by-nc-sa/3.0/us/"}]'
* </code> * </code>
*/ */
public class CCLicenseAddPatchOperation extends AddPatchOperation<String> { public class CCLicenseAddPatchOperation extends AddPatchOperation<String> {

4
dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseAddPatchOperationIT.java
View File

@@ -63,7 +63,7 @@ public class CCLicenseAddPatchOperationIT extends AbstractControllerIntegrationT
List<Operation> ops = new ArrayList<>(); List<Operation> ops = new ArrayList<>();
AddOperation addOperation = new AddOperation("/sections/cclicense/uri", AddOperation addOperation = new AddOperation("/sections/cclicense/uri",
"http://creativecommons.org/licenses/by-nc-sa/4.0/"); "https://creativecommons.org/licenses/by-nc-sa/4.0/");
ops.add(addOperation); ops.add(addOperation);
String patchBody = getPatchContent(ops); String patchBody = getPatchContent(ops);
@@ -74,7 +74,7 @@ public class CCLicenseAddPatchOperationIT extends AbstractControllerIntegrationT
.contentType(MediaType.APPLICATION_JSON_PATCH_JSON)) .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("$.sections.cclicense", allOf( .andExpect(jsonPath("$.sections.cclicense", allOf(
hasJsonPath("$.uri", is("http://creativecommons.org/licenses/by-nc-sa/4.0/")), hasJsonPath("$.uri", is("https://creativecommons.org/licenses/by-nc-sa/4.0/")),
hasJsonPath("$.rights", hasJsonPath("$.rights",
is("Attribution-NonCommercial-ShareAlike 4.0 International")), is("Attribution-NonCommercial-ShareAlike 4.0 International")),
hasJsonPath("$.file.name", is("license_rdf")) hasJsonPath("$.file.name", is("license_rdf"))

4
dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseRemovePatchOperationIT.java
View File

@@ -64,7 +64,7 @@ public class CCLicenseRemovePatchOperationIT extends AbstractControllerIntegrati
// First add a license and verify it is added // First add a license and verify it is added
List<Operation> ops = new ArrayList<>(); List<Operation> ops = new ArrayList<>();
AddOperation addOperation = new AddOperation("/sections/cclicense/uri", AddOperation addOperation = new AddOperation("/sections/cclicense/uri",
"http://creativecommons.org/licenses/by-nc-sa/4.0/"); "https://creativecommons.org/licenses/by-nc-sa/4.0/");
ops.add(addOperation); ops.add(addOperation);
String patchBody = getPatchContent(ops); String patchBody = getPatchContent(ops);
@@ -75,7 +75,7 @@ public class CCLicenseRemovePatchOperationIT extends AbstractControllerIntegrati
.contentType(MediaType.APPLICATION_JSON_PATCH_JSON)) .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
.andExpect(status().isOk()) .andExpect(status().isOk())
.andExpect(jsonPath("$.sections.cclicense", allOf( .andExpect(jsonPath("$.sections.cclicense", allOf(
hasJsonPath("$.uri", is("http://creativecommons.org/licenses/by-nc-sa/4.0/")), hasJsonPath("$.uri", is("https://creativecommons.org/licenses/by-nc-sa/4.0/")),
hasJsonPath("$.rights", hasJsonPath("$.rights",
is("Attribution-NonCommercial-ShareAlike 4.0 International")), is("Attribution-NonCommercial-ShareAlike 4.0 International")),
hasJsonPath("$.file.name", is("license_rdf")) hasJsonPath("$.file.name", is("license_rdf"))

4
dspace-server-webapp/src/test/resources/org/dspace/app/rest/cinii-second.xml
View File

@@ -57,7 +57,7 @@
<prism:startingPage>322</prism:startingPage> <prism:startingPage>322</prism:startingPage>
<prism:endingPage>331</prism:endingPage> <prism:endingPage>331</prism:endingPage>
</publication> </publication>
<dc:rights>© 2022 The Author(s). Published by National Institute for Materials Science in partnership with Taylor &amp; Francis Group. This is an Open Access article distributed under the terms of the Creative Commons Attribution License (http://creativecommons.org/licenses/by/4.0/), which permits unrestricted use, distribution, and reproduction in any medium, provided the original work is properly cited.</dc:rights> <dc:rights>© 2022 The Author(s). Published by National Institute for Materials Science in partnership with Taylor &amp; Francis Group. This is an Open Access article distributed under the terms of the Creative Commons Attribution License (https://creativecommons.org/licenses/by/4.0/), which permits unrestricted use, distribution, and reproduction in any medium, provided the original work is properly cited.</dc:rights>
<url> <url>
<rdf:Description rdf:about="http://www.lib.kobe-u.ac.jp/handle_kernel/90009212"> <rdf:Description rdf:about="http://www.lib.kobe-u.ac.jp/handle_kernel/90009212">
</rdf:Description> </rdf:Description>
@@ -74,4 +74,4 @@
<foaf:topic rdf:resource="https://cir.nii.ac.jp/all?q=XPS" dc:title="XPS"></foaf:topic> <foaf:topic rdf:resource="https://cir.nii.ac.jp/all?q=XPS" dc:title="XPS"></foaf:topic>
<dataSourceIdentifier rdf:datatype="https://cir.nii.ac.jp/schema/1.0/IRDB">oai:irdb.nii.ac.jp:01257:0005348137</dataSourceIdentifier> <dataSourceIdentifier rdf:datatype="https://cir.nii.ac.jp/schema/1.0/IRDB">oai:irdb.nii.ac.jp:01257:0005348137</dataSourceIdentifier>
</Article> </Article>
</rdf:RDF> </rdf:RDF>

36
dspace-server-webapp/src/test/resources/org/dspace/license/cc-license-rdf.xml
View File

@@ -1,31 +1,31 @@
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<result> <result>
<license-uri>http://creativecommons.org/licenses/by-nc-sa/4.0/</license-uri> <license-uri>https://creativecommons.org/licenses/by-nc-sa/4.0/</license-uri>
<license-name>Attribution-NonCommercial-ShareAlike 4.0 International</license-name> <license-name>Attribution-NonCommercial-ShareAlike 4.0 International</license-name>
<deprecated>false</deprecated> <deprecated>false</deprecated>
<rdf> <rdf>
<rdf:RDF xmlns="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <rdf:RDF xmlns="https://creativecommons.org/ns#" xmlns:rdf="https://www.w3.org/1999/02/22-rdf-syntax-ns#">
<Work xmlns:dc="http://purl.org/dc/elements/1.1/" rdf:about=""><license rdf:resource="http://creativecommons.org/licenses/by-nc-sa/4.0/"/></Work><License rdf:about="http://creativecommons.org/licenses/by-nc-sa/4.0/"> <Work xmlns:dc="https://purl.org/dc/elements/1.1/" rdf:about=""><license rdf:resource="https://creativecommons.org/licenses/by-nc-sa/4.0/"/></Work><License rdf:about="https://creativecommons.org/licenses/by-nc-sa/4.0/">
<permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/> <permits rdf:resource="https://creativecommons.org/ns#DerivativeWorks"/>
<permits rdf:resource="http://creativecommons.org/ns#Distribution"/> <permits rdf:resource="https://creativecommons.org/ns#Distribution"/>
<permits rdf:resource="http://creativecommons.org/ns#Reproduction"/> <permits rdf:resource="https://creativecommons.org/ns#Reproduction"/>
<requires rdf:resource="http://creativecommons.org/ns#Attribution"/> <requires rdf:resource="https://creativecommons.org/ns#Attribution"/>
<requires rdf:resource="http://creativecommons.org/ns#Notice"/> <requires rdf:resource="https://creativecommons.org/ns#Notice"/>
<requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/> <requires rdf:resource="https://creativecommons.org/ns#ShareAlike"/>
</License> </License>
</rdf:RDF> </rdf:RDF>
</rdf> </rdf>
<licenserdf> <licenserdf>
<rdf:RDF xmlns="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <rdf:RDF xmlns="https://creativecommons.org/ns#" xmlns:rdf="https://www.w3.org/1999/02/22-rdf-syntax-ns#">
<License rdf:about="http://creativecommons.org/licenses/by-nc-sa/4.0/"> <License rdf:about="https://creativecommons.org/licenses/by-nc-sa/4.0/">
<permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks"/> <permits rdf:resource="httasp://creativecommons.org/ns#DerivativeWorks"/>
<permits rdf:resource="http://creativecommons.org/ns#Distribution"/> <permits rdf:resource="https://creativecommons.org/ns#Distribution"/>
<permits rdf:resource="http://creativecommons.org/ns#Reproduction"/> <permits rdf:resource="https://creativecommons.org/ns#Reproduction"/>
<requires rdf:resource="http://creativecommons.org/ns#Attribution"/> <requires rdf:resource="https://creativecommons.org/ns#Attribution"/>
<requires rdf:resource="http://creativecommons.org/ns#Notice"/> <requires rdf:resource="https://creativecommons.org/ns#Notice"/>
<requires rdf:resource="http://creativecommons.org/ns#ShareAlike"/> <requires rdf:resource="https://creativecommons.org/ns#ShareAlike"/>
</License> </License>
</rdf:RDF> </rdf:RDF>
</licenserdf> </licenserdf>
<html><a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png"/></a><br/>This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.</html> <html><a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png"/></a><br/>This work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License</a>.</html>
</result> </result>

2
dspace/config/dspace.cfg
View File

@@ -1011,7 +1011,7 @@ cc.license.classfilter = publicdomain, recombo, mark
# Jurisdiction of the creative commons license -- is it ported or not? # Jurisdiction of the creative commons license -- is it ported or not?
# Use the key from the url seen in the response from the api call, # Use the key from the url seen in the response from the api call,
# http://api.creativecommons.org/rest/1.5/support/jurisdictions # https://api.creativecommons.org/rest/1.5/support/jurisdictions
# Commented out means the license is unported. # Commented out means the license is unported.
# (e.g. nz = New Zealand, uk = England and Wales, jp = Japan) # (e.g. nz = New Zealand, uk = England and Wales, jp = Japan)
# or set value none for user-selected jurisdiction # or set value none for user-selected jurisdiction

12
dspace/config/submission-forms.xml
View File

@@ -1549,27 +1549,27 @@
</pair> </pair>
<pair> <pair>
<displayed-value>Attribution (CC-BY)</displayed-value> <displayed-value>Attribution (CC-BY)</displayed-value>
<stored-value>http://creativecommons.org/licenses/by/4.0/</stored-value> <stored-value>https://creativecommons.org/licenses/by/4.0/</stored-value>
</pair> </pair>
<pair> <pair>
<displayed-value>Attribution, No Derivative Works (CC-BY-ND)</displayed-value> <displayed-value>Attribution, No Derivative Works (CC-BY-ND)</displayed-value>
<stored-value>http://creativecommons.org/licenses/by-nd/4.0/</stored-value> <stored-value>https://creativecommons.org/licenses/by-nd/4.0/</stored-value>
</pair> </pair>
<pair> <pair>
<displayed-value>Attribution, Share-alike (CC-BY-SA)</displayed-value> <displayed-value>Attribution, Share-alike (CC-BY-SA)</displayed-value>
<stored-value>http://creativecommons.org/licenses/by-sa/4.0/</stored-value> <stored-value>https://creativecommons.org/licenses/by-sa/4.0/</stored-value>
</pair> </pair>
<pair> <pair>
<displayed-value>Attribution, Non-commercial (CC-BY-NC)</displayed-value> <displayed-value>Attribution, Non-commercial (CC-BY-NC)</displayed-value>
<stored-value>http://creativecommons.org/licenses/by-nc/4.0/</stored-value> <stored-value>https://creativecommons.org/licenses/by-nc/4.0/</stored-value>
</pair> </pair>
<pair> <pair>
<displayed-value>Attribution, Non-commercial, No Derivative Works (CC-BY-NC-ND)</displayed-value> <displayed-value>Attribution, Non-commercial, No Derivative Works (CC-BY-NC-ND)</displayed-value>
<stored-value>http://creativecommons.org/licenses/by-nc-nd/4.0/</stored-value> <stored-value>https://creativecommons.org/licenses/by-nc-nd/4.0/</stored-value>
</pair> </pair>
<pair> <pair>
<displayed-value>Attribution, Non-commercial, Share-alike (CC-BY-NC-SA)</displayed-value> <displayed-value>Attribution, Non-commercial, Share-alike (CC-BY-NC-SA)</displayed-value>
<stored-value>http://creativecommons.org/licenses/by-nc-sa/4.0/</stored-value> <stored-value>https://creativecommons.org/licenses/by-nc-sa/4.0/</stored-value>
</pair> </pair>
<!-- Add here other licenses --> <!-- Add here other licenses -->
<pair> <pair>