diff --git a/dmp-backend/web/src/main/resources/config/application.yml b/dmp-backend/web/src/main/resources/config/application.yml
index be3428ab1..f45286cbb 100644
--- a/dmp-backend/web/src/main/resources/config/application.yml
+++ b/dmp-backend/web/src/main/resources/config/application.yml
@@ -14,8 +14,6 @@ spring:
optional:classpath:config/keycloak.yml[.yml], optional:classpath:config/keycloak-${spring.profiles.active}.yml[.yml], optional:file:../config/keycloak-${spring.profiles.active}.yml[.yml],
optional:classpath:config/logging.yml[.yml], optional:classpath:config/logging-${spring.profiles.active}.yml[.yml], optional:file:../config/logging-${spring.profiles.active}.yml[.yml],
optional:classpath:config/cache.yml[.yml], optional:classpath:config/cache-${spring.profiles.active}.yml[.yml], optional:file:../config/cache-${spring.profiles.active}.yml[.yml],
- optional:classpath:config/actuator.yml[.yml], optional:classpath:config/actuator-${spring.profiles.active}.yml[.yml], optional:file:../config/actuator-${spring.profiles.active}.yml[.yml],
- optional:classpath:config/email.yml[.yml], optional:classpath:config/email-${spring.profiles.active}.yml[.yml], optional:file:../config/email-${spring.profiles.active}.yml[.yml],
optional:classpath:config/elasticsearch.yml[.yml], optional:classpath:config/elasticsearch-${spring.profiles.active}.yml[.yml], optional:file:../config/elasticsearch-${spring.profiles.active}.yml[.yml],
optional:classpath:config/idpclaims.yml[.yml], optional:classpath:config/idpclaims-${spring.profiles.active}.yml[.yml], optional:file:../config/idpclaims-${spring.profiles.active}.yml[.yml],
optional:classpath:config/external.yml[.yml], optional:classpath:config/external-${spring.profiles.active}.yml[.yml], optional:file:../config/external-${spring.profiles.active}.yml[.yml],
diff --git a/dmp-backend/web/src/main/resources/config/queue.yml b/dmp-backend/web/src/main/resources/config/queue.yml
index 696a94d14..1de8f8db6 100644
--- a/dmp-backend/web/src/main/resources/config/queue.yml
+++ b/dmp-backend/web/src/main/resources/config/queue.yml
@@ -41,7 +41,7 @@ queue:
generate-file-topic: generate.file
rabbitmq:
enable: true
- interval-seconds: 3
+ interval-seconds: 30
options:
retry-threashold: 100
retry-delay-step-seconds: 300
@@ -54,7 +54,7 @@ queue:
exchange: null
rabbitmq:
enable: true
- interval-seconds: 3
+ interval-seconds: 30
options:
retry-threashold: 100
retry-delay-step-seconds: 300
diff --git a/dmp-backend/web/src/main/resources/config/reference-type.yml b/dmp-backend/web/src/main/resources/config/reference-type.yml
deleted file mode 100644
index c32be6185..000000000
--- a/dmp-backend/web/src/main/resources/config/reference-type.yml
+++ /dev/null
@@ -1,131 +0,0 @@
-reference-type:
- grant:
- fields:
- - code: startDate
- dataType: Date
- - code: endDate
- dataType: Date
- - code: pid
- dataType: Text
- - code: tag
- dataType: Text
- - code: key
- dataType: Text
- funder:
- fields:
- - code: uri
- dataType: Text
- - code: pid
- dataType: Text
- - code: tag
- dataType: Text
- - code: key
- dataType: Text
- researcher:
- fields:
- - code: pid
- dataType: Text
- - code: tag
- dataType: Text
- - code: key
- dataType: Text
- - code: firstName
- dataType: Text
- - code: lastName
- dataType: Text
- - code: uri
- dataType: Text
- service:
- fields:
- - code: pid
- dataType: Text
- - code: tag
- dataType: Text
- - code: key
- dataType: Text
- - code: uri
- dataType: Text
- registry:
- fields:
- - code: pid
- dataType: Text
- - code: tag
- dataType: Text
- - code: key
- dataType: Text
- - code: uri
- dataType: Text
- project:
- fields:
- - code: startDate
- dataType: Date
- - code: endDate
- dataType: Date
- organisation:
- fields:
- - code: tag
- dataType: Text
- - code: key
- dataType: Text
- - code: pid
- dataType: Text
- - code: uri
- dataType: Text
- - code: pidTypeField
- dataType: Text
- dataset:
- fields:
- - code: tag
- dataType: Text
- - code: key
- dataType: Text
- - code: pid
- dataType: Text
- - code: pidTypeField
- dataType: Text
- dataRepository:
- fields:
- - code: pid
- dataType: Text
- - code: tag
- dataType: Text
- - code: key
- dataType: Text
- pubRepository:
- fields:
- - code: pid
- dataType: Text
- - code: tag
- dataType: Text
- - code: key
- dataType: Text
- journal:
- fields:
- - code: pid
- dataType: Text
- - code: tag
- dataType: Text
- - code: key
- dataType: Text
- publication:
- fields:
- - code: tag
- dataType: Text
- - code: key
- dataType: Text
- - code: pid
- dataType: Text
- - code: pidTypeField
- dataType: Text
- licence:
- fields:
- - code: pid
- dataType: Text
- - code: tag
- dataType: Text
- - code: key
- dataType: Text
- - code: uri
- dataType: Text
- taxonomy:
- fields:
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/templates/email/email.html b/dmp-backend/web/src/main/resources/templates/email/email.html
deleted file mode 100644
index e85ecdd4c..000000000
--- a/dmp-backend/web/src/main/resources/templates/email/email.html
+++ /dev/null
@@ -1,305 +0,0 @@
-
-
-
-
-
- Simple Transactional Email
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
- Dear {recipient},
- You have been invited to collaborate to Data Management plan {dmpname} with role {dmprole}.
- Click the button to redirect to {dmpname}.
-
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
- |
- |
-
-
-
-
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/templates/email/emailAdmin.html b/dmp-backend/web/src/main/resources/templates/email/emailAdmin.html
deleted file mode 100644
index 7214de36b..000000000
--- a/dmp-backend/web/src/main/resources/templates/email/emailAdmin.html
+++ /dev/null
@@ -1,305 +0,0 @@
-
-
-
-
-
- Simple Transactional Email
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
- Dear {recipient},
- You have been invited to co-develop the Template {templateName}.
- Click the button to redirect to {templateName}.
-
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
- |
- |
-
-
-
-
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/templates/email/emailConfirmation.html b/dmp-backend/web/src/main/resources/templates/email/emailConfirmation.html
deleted file mode 100644
index 3d46fc62d..000000000
--- a/dmp-backend/web/src/main/resources/templates/email/emailConfirmation.html
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-
-
-
- Simple Transactional Email
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Thank you for joining OpenDMP!
- Please confirm that your email address is correct to continue.
- The link will expire in {expiration_time}.
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
- |
- |
-
-
-
-
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/templates/email/emailMergeConfirmation.html b/dmp-backend/web/src/main/resources/templates/email/emailMergeConfirmation.html
deleted file mode 100644
index 01f0536d6..000000000
--- a/dmp-backend/web/src/main/resources/templates/email/emailMergeConfirmation.html
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-
-
-
- Simple Transactional Email
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- User {userName} have sent you a merge Request.
- Please confirm that you want to merge your {host} account with that account.
- The link will expire in {expiration_time}.
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
- |
- |
-
-
-
-
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/templates/email/emailUnlinkConfirmation.html b/dmp-backend/web/src/main/resources/templates/email/emailUnlinkConfirmation.html
deleted file mode 100644
index ee547f813..000000000
--- a/dmp-backend/web/src/main/resources/templates/email/emailUnlinkConfirmation.html
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-
-
-
- Simple Transactional Email
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- You have made a request to unlink your email account in ARGOS.
- Please confirm that you want to unlink your {email} account.
- The link will expire in {expiration_time}.
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
- |
- |
-
-
-
-
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/templates/notifications/finalisedNotification.html b/dmp-backend/web/src/main/resources/templates/notifications/finalisedNotification.html
deleted file mode 100644
index 7316beb27..000000000
--- a/dmp-backend/web/src/main/resources/templates/notifications/finalisedNotification.html
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-
-
-
- Simple Transactional Email
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
- Dear {recipient},
- {reasonName} just finalised the {name}.
-
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
- |
- |
-
-
-
-
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/templates/notifications/modifiedFinalisedNotification.html b/dmp-backend/web/src/main/resources/templates/notifications/modifiedFinalisedNotification.html
deleted file mode 100644
index 1cfb61e82..000000000
--- a/dmp-backend/web/src/main/resources/templates/notifications/modifiedFinalisedNotification.html
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-
-
-
- Simple Transactional Email
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
- Dear {recipient},
- {reasonName} just made changes and finalised the {name}.
-
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
- |
- |
-
-
-
-
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/templates/notifications/modifiedNotification.html b/dmp-backend/web/src/main/resources/templates/notifications/modifiedNotification.html
deleted file mode 100644
index 87460d2da..000000000
--- a/dmp-backend/web/src/main/resources/templates/notifications/modifiedNotification.html
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-
-
-
- Simple Transactional Email
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
- Dear {recipient},
- {reasonName} just made changes to the {name}.
-
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
- |
- |
-
-
-
-
\ No newline at end of file
diff --git a/dmp-backend/web/src/main/resources/templates/notifications/publishNotification.html b/dmp-backend/web/src/main/resources/templates/notifications/publishNotification.html
deleted file mode 100644
index d23a1d6d8..000000000
--- a/dmp-backend/web/src/main/resources/templates/notifications/publishNotification.html
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-
-
-
- Simple Transactional Email
-
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
-
-
- Dear {recipient},
- {reasonName} just publish the {name}.
-
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
- |
- |
-
-
-
-
\ No newline at end of file