coar-notify-7 follow-ups on the community advices

dspace/config/dspace.cfg

@@ -938,8 +938,6 @@ registry.metadata.load = dspace-types.xml
 registry.metadata.load = iiif-types.xml
 registry.metadata.load = datacite-types.xml
 registry.metadata.load = coar-types.xml
-registry.metadata.load = notify-types.xml
-
 
 #---------------------------------------------------------------#
 #-----------------UI-Related CONFIGURATIONS---------------------#
@@ -1662,7 +1660,6 @@ include = ${module_dir}/rdf.cfg
 include = ${module_dir}/rest.cfg
 include = ${module_dir}/iiif.cfg
 include = ${module_dir}/signposting.cfg
-include = ${module_dir}/ldn.cfg
 include = ${module_dir}/solr-statistics.cfg
 include = ${module_dir}/solrauthority.cfg
 include = ${module_dir}/researcher-profile.cfg

dspace/config/modules/coar-notify-ldn.cfg

@@ -10,3 +10,37 @@ coar-notify.enabled = true
 
 # For debugging purposes only, skip the check on the IP range.
 #coar-notify.ip-range.enabled = false
+
+#### LDN CONFIGURATION ####
+# To enable the LDN service, set to true.
+ldn.enabled = true
+
+#LDN message inbox endpoint
+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.cron = 0 0/5 * * * ?
+
+# LDN Queue timeout checks LDN Message Entities relation with the queue
+ldn.queue.timeout.checker.cron = 0 0 */1 * * ? 
+
+# LDN Queue extractor elaborates LDN Message entities with max_attempts < than ldn.processor.max.attempts
+ldn.processor.max.attempts = 5
+
+# LDN Queue extractor sets LDN Message Entity queue_timeout property every time it tryies a new elaboration
+# of the message. LDN Message with a future queue_timeout is not elaborated. This property is used to calculateas:
+# a new timeout, such as: new_timeout = now + ldn.processor.queue.msg.timeout (in minutes)
+ldn.processor.queue.msg.timeout = 60
+
+
+# EMAIL CONFIGURATION
+
+ldn.notification.email = ${mail.admin}

dspace/config/modules/ldn.cfg

@@ -1,33 +0,0 @@
-#### LDN CONFIGURATION ####
-# To enable the LDN service, set to true.
-ldn.enabled = true
-
-#LDN message inbox endpoint
-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.cron = 0 0/5 * * * ?
-
-# LDN Queue timeout checks LDN Message Entities relation with the queue
-ldn.queue.timeout.checker.cron = 0 0 */1 * * ? 
-
-# LDN Queue extractor elaborates LDN Message entities with max_attempts < than ldn.processor.max.attempts
-ldn.processor.max.attempts = 5
-
-# LDN Queue extractor sets LDN Message Entity queue_timeout property every time it tryies a new elaboration
-# of the message. LDN Message with a future queue_timeout is not elaborated. This property is used to calculateas:
-# a new timeout, such as: new_timeout = now + ldn.processor.queue.msg.timeout (in minutes)
-ldn.processor.queue.msg.timeout = 60
-
-
-# EMAIL CONFIGURATION
-
-ldn.notification.email = ${mail.admin}

dspace/config/registries/coar-types.xml

@@ -51,4 +51,11 @@
         <scope_note>Released by</scope_note>
     </dc-type>
 
+    <dc-type>
+        <schema>coar</schema>
+        <element>notify</element>
+        <qualifier>endorsedBy</qualifier>
+        <scope_note>Endorsed by</scope_note>
+    </dc-type>
+
 </dspace-dc-types>

dspace/config/registries/notify-types.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE dspace-dc-types SYSTEM "dspace-dc-types.dtd">
-
-<dspace-dc-types>
-    <dspace-header>
-        <title>Notify fields definition</title>
-    </dspace-header>
-    
-    <dc-schema>
-        <name>notify</name>
-        <namespace>http://dspace.org/notify</namespace>
-    </dc-schema>
-    
-    <dc-type>
-        <schema>notify</schema>
-        <element>relation</element>
-        <qualifier>endorsedBy</qualifier>
-        <scope_note>Endorsed by</scope_note>
-    </dc-type>
-
-</dspace-dc-types>

dspace/config/spring/api/coar-notify.xml

@@ -19,17 +19,17 @@
         </property>
     </bean>
 
-    <bean id="requestReview" class="org.dspace.coarnotify.LDNPattern">
+    <bean id="requestReview" class="org.dspace.coarnotify.COARPattern">
         <property name="pattern" value="request-review"/>
         <property name="multipleRequest" value="true"/>
     </bean>
 
-    <bean id="requestEndorsement" class="org.dspace.coarnotify.LDNPattern">
+    <bean id="requestEndorsement" class="org.dspace.coarnotify.COARPattern">
         <property name="pattern" value="request-endorsement"/>
         <property name="multipleRequest" value="true"/>
     </bean>
 
-    <bean id="requestIngest" class="org.dspace.coarnotify.LDNPattern">
+    <bean id="requestIngest" class="org.dspace.coarnotify.COARPattern">
         <property name="pattern" value="request-ingest"/>
         <property name="multipleRequest" value="false"/>
     </bean>

dspace/config/spring/api/qaevents.xml

@@ -79,7 +79,7 @@
      </bean>
 
      <bean id="AddEndorsedMetadataAction" class="org.dspace.qaevent.action.QANotifySimpleMetadataAction">
-        <property name="metadata" value="notify.relation.endorsedBy"/>
+        <property name="metadata" value="coar.notify.endorsedBy"/>
      </bean>
      <!-- Add a new identifier to the given item, using the defined types mapping -->
      <bean id="PIDMetadataAction" class="org.dspace.qaevent.action.QAOpenaireMetadataMapAction">