hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'originGithub/task/main/DURACOM-272' into task/main/DURACOM-272

Browse Source
This commit is contained in:
Stefano Maffei
2024-06-12 12:01:55 +02:00
parent db930483e6 874cfcdb0d
commit 7654475bab
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dspace-server-webapp/src/test/java/org/dspace/app/rest/LDNInboxControllerIT.java
View File

@@ -114,6 +114,7 @@ public class LDNInboxControllerIT extends AbstractControllerIntegrationTest {
.withUrl("https://review-service.com/inbox/about/") .withUrl("https://review-service.com/inbox/about/")
.withLdnUrl("https://review-service.com/inbox/") .withLdnUrl("https://review-service.com/inbox/")
.withScore(BigDecimal.valueOf(0.6d)) .withScore(BigDecimal.valueOf(0.6d))
.withStatus(true)
.withLowerIp("127.0.0.1") .withLowerIp("127.0.0.1")
.withUpperIp("127.0.0.3") .withUpperIp("127.0.0.3")
.build(); .build();
@@ -168,6 +169,7 @@ public class LDNInboxControllerIT extends AbstractControllerIntegrationTest {
.withUrl("https://review-service.com/inbox/about/") .withUrl("https://review-service.com/inbox/about/")
.withLdnUrl("https://review-service.com/inbox/") .withLdnUrl("https://review-service.com/inbox/")
.withScore(BigDecimal.valueOf(0.6d)) .withScore(BigDecimal.valueOf(0.6d))
.withStatus(true)
.withLowerIp("127.0.0.1") .withLowerIp("127.0.0.1")
.withUpperIp("127.0.0.3") .withUpperIp("127.0.0.3")
.build(); .build();
@@ -225,6 +227,7 @@ public class LDNInboxControllerIT extends AbstractControllerIntegrationTest {
.withUrl("https://review-service.com/inbox/about/") .withUrl("https://review-service.com/inbox/about/")
.withLdnUrl("https://review-service.com/inbox/") .withLdnUrl("https://review-service.com/inbox/")
.withScore(BigDecimal.valueOf(0.6d)) .withScore(BigDecimal.valueOf(0.6d))
.withStatus(true)
.withLowerIp("127.0.0.1") .withLowerIp("127.0.0.1")
.withUpperIp("127.0.0.3") .withUpperIp("127.0.0.3")
.build(); .build();

3
dspace-server-webapp/src/test/java/org/dspace/app/rest/NotifyServiceRestRepositoryIT.java
View File

@@ -2066,6 +2066,7 @@ public class NotifyServiceRestRepositoryIT extends AbstractControllerIntegration
NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one") NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
.withDescription("service description one") .withDescription("service description one")
.withUrl("https://service.ldn.org/about") .withUrl("https://service.ldn.org/about")
.withStatus(true)
.withLdnUrl("https://service.ldn.org/inbox") .withLdnUrl("https://service.ldn.org/inbox")
.build(); .build();
@@ -2073,6 +2074,7 @@ public class NotifyServiceRestRepositoryIT extends AbstractControllerIntegration
NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name two") NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name two")
.withDescription("service description two") .withDescription("service description two")
.withUrl("https://service2.ldn.org/about") .withUrl("https://service2.ldn.org/about")
.withStatus(true)
.withLdnUrl("https://service2.ldn.org/inbox") .withLdnUrl("https://service2.ldn.org/inbox")
.build(); .build();
@@ -2080,6 +2082,7 @@ public class NotifyServiceRestRepositoryIT extends AbstractControllerIntegration
NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name three") NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name three")
.withDescription("service description") .withDescription("service description")
.withUrl("https://service3.ldn.org/about") .withUrl("https://service3.ldn.org/about")
.withStatus(true)
.withLdnUrl("https://service3.ldn.org/inbox") .withLdnUrl("https://service3.ldn.org/inbox")
.build(); .build();

2
dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_announce_release.json
View File

@@ -28,7 +28,7 @@
"as:object": "newValue", "as:object": "newValue",
"oldas:relationship": "http://purl.org/vocab/frbr/core#supplement", "oldas:relationship": "http://purl.org/vocab/frbr/core#supplement",
"as:relationship": "somethingElse", "as:relationship": "somethingElse",
"as:subject": "https://research-organisation.org/repository/item/201203/421/", "as:subject": "<<object_handle>>",
"id": "<<object_handle>>", "id": "<<object_handle>>",
"type": "Relationship" "type": "Relationship"
}, },

8
dspace/config/modules/ldn.cfg
View File

@@ -16,14 +16,6 @@ ldn.enabled = false
#LDN message inbox endpoint #LDN message inbox endpoint
ldn.notify.inbox = ${dspace.server.url}/ldn/inbox ldn.notify.inbox = ${dspace.server.url}/ldn/inbox
# List the external services IDs for review/endorsement
# These IDs needs to be configured in the input-form.xml as well
# These IDs must contain only the hostname and the resource path
# Do not include any protocol
# Each IDs must match with the ID returned by the external service
# in the JSON-LD Actor field
#service.service-id.ldn =
# LDN Queue extractor elaborates LDN Message entities of the queue # LDN Queue extractor elaborates LDN Message entities of the queue
ldn.queue.extractor.cron = 0 0/5 * * * ? ldn.queue.extractor.cron = 0 0/5 * * * ?