Merge remote-tracking branch 'dataquest/customer/uk' into customer/uk

this is the merge of drruk-2024.07.10106742964
ufal · Sep 4, 2024 · e893ca6 · e893ca6
2 parents 44618ec + 4d347ec
commit e893ca6
Show file tree

Hide file tree

Showing 4 changed files with 138 additions and 1,320 deletions.
diff --git a/dspace-server-webapp/src/main/resources/application.properties b/dspace-server-webapp/src/main/resources/application.properties
@@ -38,6 +38,11 @@
 # interact with or read its configuration from dspace.cfg.
 dspace.dir=${dspace.dir}
 
+########################
+# Servlet context path configuration for spring boot application running with embedded tomcat
+#
+server.servlet.context-path=/server
+
 ########################
 # Jackson serialization settings
 #

diff --git a/dspace/config/clarin-dspace.cfg b/dspace/config/clarin-dspace.cfg
@@ -137,7 +137,7 @@ featured.service.teitok.description = A web-based platform for viewing, creating
 # Turn off the discofeed, it is allowed by default
 shibboleth.discofeed.allowed = false
 # File where is DiscoJuiceFeed response
-shibboleth.discofeed.url = https://dev-5.pc:8443/Shibboleth.sso/DiscoFeed
+shibboleth.discofeed.url = https://lindat.mff.cuni.cz/Shibboleth.sso/DiscoFeed
 
 # CRON job refresh time definition - default is refresh in every 2 hours.
 discojuice.refresh = 0 0 */2 * * ?
@@ -209,13 +209,13 @@ identifier.doi.namespaceseparator = dspace/
 ##
 crosswalk.dissemination.DataCite.stylesheet = crosswalks/DIM2DataCite.xsl
 crosswalk.dissemination.DataCite.schemaLocation = \
-    http://datacite.org/schema/kernel-3 \
-    http://schema.datacite.org/meta/kernel-3/metadata.xsd
+    http://datacite.org/schema/kernel-4 \
+    https://schema.datacite.org/meta/kernel-4.4/metadata.xsd
 crosswalk.dissemination.DataCite.preferList = false
 crosswalk.dissemination.DataCite.publisher = My University
 #crosswalk.dissemination.DataCite.dataManager = # defaults to publisher
 #crosswalk.dissemination.DataCite.hostingInstitution = # defaults to publisher
-crosswalk.dissemination.DataCite.namespace = http://datacite.org/schema/kernel-3
+crosswalk.dissemination.DataCite.namespace = http://datacite.org/schema/kernel-4
 
 # consumer to update metadata of DOIs
 event.consumer.doi.class = org.dspace.identifier.doi.DOIConsumer
@@ -225,7 +225,7 @@ event.consumer.doi.filters = Item+Modify_Metadata
 # Adding doi here makes DSpace send metadata updates to your doi registration agency.
 # Add rdf here, if you are using dspace-rdf to export your repository content as RDF.
 # Add iiif here, if you are using dspace-iiif.
-event.dispatcher.default.consumers = versioning, discovery, eperson
+event.dispatcher.default.consumers = versioning, discovery, eperson, doi
 
 # Edit Item - Status option
 identifiers.item-status.register-doi = false

diff --git a/dspace/config/item-submission.xml b/dspace/config/item-submission.xml
@@ -18,10 +18,7 @@
     <!-- for handle "default". -->
     <submission-map>
         <!-- Default submission process -->
-        <name-map collection-handle="default" submission-name="traditional"/>
-        <name-map collection-handle="123456789/1127" submission-name="clariah"/>
-        <name-map collection-handle="20.500.12800/3" submission-name="clariahSubmissions"/>
-        <name-map collection-handle="11234/5012" submission-name="teachingSubmissions"/>
+        <name-map collection-handle="default" submission-name="datacite"/>
         <!-- Sample Entities Collection configuration based on the demo Entities dataset available at:
              https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
              This sets up the following Entity-based Collections in that dataset:
@@ -49,10 +46,10 @@
         <name-map collection-handle="123456789/29" submission-name="JournalVolume"/>
         <name-map collection-handle="123456789/30" submission-name="JournalIssue"/>
         -->
-        <!-- These configurations enable default submission forms per Entity type 
-            
+        <!-- These configurations enable default submission forms per Entity type
+
             The  collection-entity-type will be the entity-type attribute associated with a collection,
-            typically the entity name that is associated with a collection if any created or loaded 
+            typically the entity name that is associated with a collection if any created or loaded
             (that is usually specified in relationship-types.xml).
             - - - - - -
             PLEASE NOTICE THAT YOU WILL HAVE TO RESTART DSPACE
@@ -260,38 +257,6 @@
             <processing-class>org.dspace.app.rest.submit.step.ShowIdentifiersStep</processing-class>
             <type>identifiers</type>
         </step-definition>
-
-        <step-definition id="clariahSubmissionsPageOne" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="clariahSubmissionsPageTwo" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="clariahSubmissionsPageThree" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-
-        <step-definition id="teachingSubmissionsPageOne" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="teachingSubmissionsPageTwo" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
-        <step-definition id="teachingSubmissionsPageThree" mandatory="true">
-            <heading>submit.progressbar.describe.stepone</heading>
-            <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
-            <type>submission-form</type>
-        </step-definition>
     </step-definitions>
 
     <!-- The submission-definitions map lays out the detailed definition of -->
@@ -318,7 +283,7 @@
             <step id="collection"/>
             <!-- To include the 'Show Identifiers' step, uncomment the line below. Make sure
                  that identifiers.cfg and identifier-service.xml are properly configured. -->
-            <step id="identifiers"/>
+            <step id="identifiers"/><!---->
             <!--Step will be to Describe the item. -->
             <step id="traditionalpageone"/>
             <step id="traditionalpagetwo"/>
@@ -342,6 +307,17 @@
             <step id="clarin-license"/>
         </submission-process>
 
+        <submission-process name="datacite">
+            <step id="collection"></step>
+            <step id="identifiers"/><!---->
+            <step id="dataciterequired"></step>
+            <step id="dataciterecommended"></step>
+            <step id="dataciteoptional"></step>
+            <step id="upload"/>
+            <step id="license"/>
+            <step id="clarin-license"/>
+        </submission-process>
+
         <!--
         Submission Process for 'Publication' Entities.
         These are not to be confused with default Items, as Publications may be linked with other Entities
@@ -460,28 +436,6 @@
             <step id="license"/>
             <step id="clarin-license"/>
         </submission-process>
-
-        <submission-process name="clariahSubmissions">
-            <step id="collection"/>
-            <step id="clarin-notice"/>
-            <step id="clariahSubmissionsPageOne"/>
-            <step id="clariahSubmissionsPageTwo"/>
-            <step id="clariahSubmissionsPageThree"/>
-            <step id="upload"/>
-            <step id="license"/>
-            <step id="clarin-license"/>
-        </submission-process>
-
-        <submission-process name="teachingSubmissions">
-            <step id="collection"/>
-            <step id="clarin-notice"/>
-            <step id="teachingSubmissionsPageOne"/>
-            <step id="teachingSubmissionsPageTwo"/>
-            <step id="teachingSubmissionsPageThree"/>
-            <step id="upload"/>
-            <step id="license"/>
-            <step id="clarin-license"/>
-        </submission-process>
     </submission-definitions>
 
 </item-submission>