From ba68fab2b32f1069efbe8a10c150e79720a9552a Mon Sep 17 00:00:00 2001 From: Mark Patton Date: Tue, 3 Dec 2024 09:20:23 -0500 Subject: [PATCH 1/3] Fix the LDAP healthcheck so it does not incorrectly fail after succeeding once. --- eclipse-pass.local.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclipse-pass.local.yml b/eclipse-pass.local.yml index 3285cef..4b9206a 100644 --- a/eclipse-pass.local.yml +++ b/eclipse-pass.local.yml @@ -86,9 +86,9 @@ services: env_file: - .env - .eclipse-pass.local_env - # Healthy when manage to create the suffix and load users + # Healthy when users found or successfully created healthcheck: - test: '(dsconf -D "cn=Directory Manager" localhost backend create --suffix="$$DS_SUFFIX_NAME" --be-name="pass"; ldapadd -f /pass.ldif -H ldap://localhost:3389 -w "$$DS_DM_PASSWORD" -D "cn=Directory Manager") || exit 1' + test: '(dsconf -D "cn=Directory Manager" localhost backend create --suffix="$$DS_SUFFIX_NAME" --be-name="pass"; ldapsearch -H ldap://localhost:3389 -w "$$DS_DM_PASSWORD" -D "cn=Directory Manager" || ldapadd -f /pass.ldif -H ldap://localhost:3389 -w "$$DS_DM_PASSWORD" -D "cn=Directory Manager") || exit 1' start_period: 60s interval: 5s volumes: From 4d1f0f6c84c4f6cdf45bd50377914b955dcfccca Mon Sep 17 00:00:00 2001 From: Mark Patton Date: Tue, 3 Dec 2024 09:20:31 -0500 Subject: [PATCH 2/3] Switch the DSpace deposit to use the REST API, not SWORD --- .eclipse-pass.local_env | 3 +++ demo_data.json | 8 ++------ deposit/deposit-repositories.json | 11 +++++++++++ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.eclipse-pass.local_env b/.eclipse-pass.local_env index a571ea6..4be98ee 100644 --- a/.eclipse-pass.local_env +++ b/.eclipse-pass.local_env @@ -53,6 +53,9 @@ PASS_CLIENT_URL=http://pass-core:8080/ PASS_CLIENT_USER=backend PASS_CLIENT_PASSWORD=backend +DSPACE_API_URL=http://dspace:8080/server/api +DSPACE_WEBSITE_URL=http://localhost:4000 +DSPACE_COLLECTION_HANDLE=123456789/3 DSPACE_SERVER=dspace:8080 DSPACE_USER=test@test.edu DSPACE_PASSWORD=admin diff --git a/demo_data.json b/demo_data.json index a620afa..e5dc19f 100644 --- a/demo_data.json +++ b/demo_data.json @@ -23,10 +23,9 @@ "attributes": { "agreementText": "NON-EXCLUSIVE LICENSE FOR USE OF MATERIALS This non-exclusive license defines the terms for the deposit of Materials in all formats into the digital repository of materials collected, preserved and made available through the Johns Hopkins Digital Repository, JScholarship. The Contributor hereby grants to Johns Hopkins a royalty free, non-exclusive worldwide license to use, re-use, display, distribute, transmit, publish, re-publish or copy the Materials, either digitally or in print, or in any other medium, now or hereafter known, for the purpose of including the Materials hereby licensed in the collection of materials in the Johns Hopkins Digital Repository for educational use worldwide. In some cases, access to content may be restricted according to provisions established in negotiation with the copyright holder. This license shall not authorize the commercial use of the Materials by Johns Hopkins or any other person or organization, but such Materials shall be restricted to non-profit educational use. Persons may apply for commercial use by contacting the copyright holder. Copyright and any other intellectual property right in or to the Materials shall not be transferred by this agreement and shall remain with the Contributor, or the Copyright holder if different from the Contributor. Other than this limited license, the Contributor or Copyright holder retains all rights, title, copyright and other interest in the images licensed. If the submission contains material for which the Contributor does not hold copyright, the Contributor represents that s/he has obtained the permission of the Copyright owner to grant Johns Hopkins the rights required by this license, and that such third-party owned material is clearly identified and acknowledged within the text or content of the submission. If the submission is based upon work that has been sponsored or supported by an agency or organization other than Johns Hopkins, the Contributor represents that s/he has fulfilled any right of review or other obligations required by such contract or agreement. Johns Hopkins will not make any alteration, other than as allowed by this license, to your submission. This agreement embodies the entire agreement of the parties. No modification of this agreement shall be of any effect unless it is made in writing and signed by all of the parties to the agreement.", "integrationType": "full", - "formSchema": "{\"id\":\"JScholarship\",\"schema\":{\"title\":\"Johns Hopkins - JScholarship

Deposit requirements for JH\"s institutional repository JScholarship.

\",\"type\":\"object\",\"properties\":{\"authors\":{\"title\":\"
Author(s) (required)
\",\"type\":\"array\",\"uniqueItems\":true,\"items\":{\"type\":\"object\",\"properties\":{\"author\":{\"type\":\"string\",\"fieldClass\":\"body-text col-6 pull-left pl-0\"}}}}}},\"options\":{\"fields\":{\"authors\":{\"hidden\":false}}}}", "name": "JScholarship", "url": "https://jscholarship.library.jhu.edu/", - "repositoryKey": "jscholarship", + "repositoryKey": "DSpace", "schemas": [ "https://eclipse-pass.github.io/metadata-schemas/jhu/jscholarship.json", "https://eclipse-pass.github.io/metadata-schemas/jhu/common.json" @@ -42,7 +41,6 @@ "type": "repository", "attributes": { "integrationType": "web-link", - "formSchema": "{\"id\":\"dec\",\"schema\":{\"title\":\"United States Agency for International Development - DEC
Requires deposit to the Development Experience Clearingshouse (DEC).

Automatic submission from PASS to ERIC is not available at this time. Instead, submission to DEC will be prompted before this submission is finalized in PASS. The publication information collected so far can be used to complete the submission via the DEC website.

\",\"type\":\"object\",\"properties\":{}},\"options\":{\"fields\":{}}}", "name": "Development Experience Clearingshouse (DEC)", "url": "https://dec.usaid.gov/", "repositoryKey": "dec" @@ -57,7 +55,6 @@ "type": "repository", "attributes": { "integrationType": "one-way", - "formSchema": "{\"id\":\"nih\",\"data\":{},\"schema\":{\"title\":\"NIH Manuscript Submission System (NIHMS)

The following metadata fields will be part of the NIHMS submission.

\",\"type\":\"object\",\"properties\":{\"journal-NLMTA-ID\":{\"type\":\"string\"}}},\"options\":{\"fields\":{\"journal-NLMTA-ID\":{\"type\":\"text\",\"label\":\"Journal NLMTA ID\",\"placeholder\":\"\"}}}}", "schemas": [ "https://eclipse-pass.github.io/metadata-schemas/jhu/nihms.json", "https://eclipse-pass.github.io/metadata-schemas/jhu/common.json" @@ -77,12 +74,11 @@ "attributes": { "agreementText": "InvenioRDM agreement", "integrationType": "full", - "formSchema": "{\"id\":\"InvenioRDM\",\"schema\":{\"title\":\"InvenioRDM

Deposit requirements.

\",\"type\":\"object\",\"properties\":{\"authors\":{\"title\":\"
Author(s) (required)
\",\"type\":\"array\",\"uniqueItems\":true,\"items\":{\"type\":\"object\",\"properties\":{\"author\":{\"type\":\"string\",\"fieldClass\":\"body-text col-6 pull-left pl-0\"}}}}}},\"options\":{\"fields\":{\"authors\":{\"hidden\":false}}}}", "name": "InvenioRDM", "url": "https://inveniosoftware.org/products/rdm/", "repositoryKey": "inveniordm", "schemas": [ - "https://eclipse-pass.github.io/metadata-schemas/jhu/jscholarship.json", + "https://eclipse-pass.github.io/metadata-schemas/jhu/inveniordm.json", "https://eclipse-pass.github.io/metadata-schemas/jhu/common.json" ] } diff --git a/deposit/deposit-repositories.json b/deposit/deposit-repositories.json index 5428922..ab8f50d 100644 --- a/deposit/deposit-repositories.json +++ b/deposit/deposit-repositories.json @@ -80,5 +80,16 @@ "protocol": "invenioRdm" } } + }, + "DSpace": { + "assembler": { + "specification": "DSpace", + "beanName": "DSpaceAssembler" + }, + "transport-config": { + "protocol-binding": { + "protocol": "DSpace" + } + } } } From fc07c70f4b0d5c95823f8663720d4d27384e6818 Mon Sep 17 00:00:00 2001 From: Russ Poetker Date: Fri, 7 Feb 2025 14:41:38 -0500 Subject: [PATCH 3/3] Update invenio env var --- .eclipse-pass.local_env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eclipse-pass.local_env b/.eclipse-pass.local_env index 4be98ee..c1f9bf5 100644 --- a/.eclipse-pass.local_env +++ b/.eclipse-pass.local_env @@ -61,7 +61,7 @@ DSPACE_USER=test@test.edu DSPACE_PASSWORD=admin INVENIORDM_API_BASE_URL=https://pass-docker-invenio-rdm-frontend-1/api -INVENIORDM_VERIFY_SSL_CERT=false +INVENIORDM_API_TOKEN= PMC_FTP_HOST=pmc-sftp-server PMC_FTP_PORT=22