diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/NotificationManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/NotificationManager.java index afe65dd97..f9c6403c7 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/NotificationManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/NotificationManager.java @@ -60,20 +60,20 @@ public class NotificationManager { case DMP_MODIFIED: case DATASET_MODIFIED: subjectTemplate = this.environment.getProperty("notification.modified.subject"); - contentTemplate = mailService.getMailTemplateContent("classpath:modifiedNotification.html"); + contentTemplate = mailService.getMailTemplateContent("classpath:templates/notifications/modifiedNotification.html"); break; case DMP_PUBLISH: subjectTemplate = this.environment.getProperty("notification.publish.subject"); - contentTemplate = mailService.getMailTemplateContent("classpath:publishNotification.html"); + contentTemplate = mailService.getMailTemplateContent("classpath:templates/notifications/publishNotification.html"); break; case DMP_FINALISED: subjectTemplate = this.environment.getProperty("notification.finalised.subject"); - contentTemplate = mailService.getMailTemplateContent("classpath:finalisedNotification.html"); + contentTemplate = mailService.getMailTemplateContent("classpath:templates/notifications/finalisedNotification.html"); break; case DMP_MODIFIED_FINALISED: case DATASET_MODIFIED_FINALISED: subjectTemplate = this.environment.getProperty("notification.modifiedFinalised.subject"); - contentTemplate = mailService.getMailTemplateContent("classpath:modifiedFinalisedNotification.html"); + contentTemplate = mailService.getMailTemplateContent("classpath:templates/notifications/modifiedFinalisedNotification.html"); break; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailServiceImpl.java index c92cb231b..dec804949 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailServiceImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/ConfirmationEmailServiceImpl.java @@ -56,7 +56,7 @@ public class ConfirmationEmailServiceImpl implements ConfirmationEmailService { } private String createContent(UUID confirmationToken, MailService mailService) { - String content = mailService.getMailTemplateContent("classpath:emailConfirmation.html"); + String content = mailService.getMailTemplateContent("classpath:templates/email/emailConfirmation.html"); content = content.replace("{confirmationToken}", confirmationToken.toString()); content = content.replace("{expiration_time}", secondsToTime(Integer.parseInt(this.environment.getProperty("conf_email.expiration_time_seconds")))); content = content.replace("{host}", this.environment.getProperty("dmp.domain")); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java index ed175bda2..a03a917a0 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java @@ -71,7 +71,7 @@ public class InvitationServiceImpl implements InvitationService { return CompletableFuture.runAsync(() -> { SimpleMail mail = new SimpleMail(); mail.setSubject(createSubject(dmp, mailService.getMailTemplateSubject())); - mail.setContent(createContent(invitation.getId(), dmp, recipient, mailService.getMailTemplateContent("classpath:email.html"))); + mail.setContent(createContent(invitation.getId(), dmp, recipient, mailService.getMailTemplateContent("classpath:templates/email/email.html"))); mail.setTo(invitation.getInvitationEmail()); try { mailService.sendSimpleMail(mail); diff --git a/dmp-backend/web/src/main/resources/application-devel.properties b/dmp-backend/web/src/main/resources/config/application-devel.properties similarity index 100% rename from dmp-backend/web/src/main/resources/application-devel.properties rename to dmp-backend/web/src/main/resources/config/application-devel.properties diff --git a/dmp-backend/web/src/main/resources/application-production.properties b/dmp-backend/web/src/main/resources/config/application-production.properties similarity index 100% rename from dmp-backend/web/src/main/resources/application-production.properties rename to dmp-backend/web/src/main/resources/config/application-production.properties diff --git a/dmp-backend/web/src/main/resources/application-staging.properties b/dmp-backend/web/src/main/resources/config/application-staging.properties similarity index 100% rename from dmp-backend/web/src/main/resources/application-staging.properties rename to dmp-backend/web/src/main/resources/config/application-staging.properties diff --git a/dmp-backend/web/src/main/resources/application.properties b/dmp-backend/web/src/main/resources/config/application.properties similarity index 97% rename from dmp-backend/web/src/main/resources/application.properties rename to dmp-backend/web/src/main/resources/config/application.properties index 9af18afb3..99187392b 100644 --- a/dmp-backend/web/src/main/resources/application.properties +++ b/dmp-backend/web/src/main/resources/config/application.properties @@ -88,3 +88,6 @@ notification.modified.subject=[OpenDMP] The {name} has been modified notification.publish.subject=[OpenDMP] The {name} has been published notification.finalised.subject=[OpenDMP] The {name} has been finalised notification.modifiedFinalised.subject=[OpenDMP] The {name} has been modified and finalised + +#############LOGGING######### +logging.config=classpath:logging/logback-${spring.profiles.active}.xml \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/ExternalUrls.xml b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml similarity index 100% rename from dmp-backend/web/src/main/resources/ExternalUrls.xml rename to dmp-backend/web/src/main/resources/externalUrls/ExternalUrls.xml diff --git a/dmp-backend/web/src/main/resources/ExternalUrlsProduction.xml b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrlsProduction.xml similarity index 100% rename from dmp-backend/web/src/main/resources/ExternalUrlsProduction.xml rename to dmp-backend/web/src/main/resources/externalUrls/ExternalUrlsProduction.xml diff --git a/dmp-backend/web/src/main/resources/ExternalUrlsStaging.xml b/dmp-backend/web/src/main/resources/externalUrls/ExternalUrlsStaging.xml similarity index 100% rename from dmp-backend/web/src/main/resources/ExternalUrlsStaging.xml rename to dmp-backend/web/src/main/resources/externalUrls/ExternalUrlsStaging.xml diff --git a/dmp-backend/web/src/main/resources/logging/logback-devel.xml b/dmp-backend/web/src/main/resources/logging/logback-devel.xml new file mode 100644 index 000000000..9ea9f4d62 --- /dev/null +++ b/dmp-backend/web/src/main/resources/logging/logback-devel.xml @@ -0,0 +1,33 @@ + + + + + ${CONSOLE_LOG_PATTERN} + + + + + ${user.home}/openDMP/logs/openDMP.log + + ${user.home}/openDMP/logs/openDMP-%d{yyyy-MM}.%i.log + + 100MB + + 30 + 3GB + + + ${FILE_LOG_PATTERN} + + + + + + + + + + + + + \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/logging/logback-production.xml b/dmp-backend/web/src/main/resources/logging/logback-production.xml new file mode 100644 index 000000000..f4ee7e665 --- /dev/null +++ b/dmp-backend/web/src/main/resources/logging/logback-production.xml @@ -0,0 +1,33 @@ + + + + + ${CONSOLE_LOG_PATTERN} + + + + + ${user.home}/openDMP/logs/openDMP.log + + ${user.home}/openDMP/logs/openDMP-%d{yyyy-MM}.%i.log + + 100MB + + 30 + 3GB + + + ${FILE_LOG_PATTERN} + + + + + + + + + + + + + \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/logging/logback-staging.xml b/dmp-backend/web/src/main/resources/logging/logback-staging.xml new file mode 100644 index 000000000..260544cf5 --- /dev/null +++ b/dmp-backend/web/src/main/resources/logging/logback-staging.xml @@ -0,0 +1,33 @@ + + + + + ${CONSOLE_LOG_PATTERN} + + + + + ${user.home}/openDMP/logs/openDMP.log + + ${user.home}/openDMP/logs/openDMP-%d{yyyy-MM}.%i.log + + 100MB + + 30 + 3GB + + + ${FILE_LOG_PATTERN} + + + + + + + + + + + + + \ No newline at end of file diff --git a/dmp-backend/web/src/main/resources/email.html b/dmp-backend/web/src/main/resources/templates/email/email.html similarity index 100% rename from dmp-backend/web/src/main/resources/email.html rename to dmp-backend/web/src/main/resources/templates/email/email.html diff --git a/dmp-backend/web/src/main/resources/emailConfirmation.html b/dmp-backend/web/src/main/resources/templates/email/emailConfirmation.html similarity index 100% rename from dmp-backend/web/src/main/resources/emailConfirmation.html rename to dmp-backend/web/src/main/resources/templates/email/emailConfirmation.html diff --git a/dmp-backend/web/src/main/resources/finalisedNotification.html b/dmp-backend/web/src/main/resources/templates/notifications/finalisedNotification.html similarity index 100% rename from dmp-backend/web/src/main/resources/finalisedNotification.html rename to dmp-backend/web/src/main/resources/templates/notifications/finalisedNotification.html diff --git a/dmp-backend/web/src/main/resources/modifiedFinalisedNotification.html b/dmp-backend/web/src/main/resources/templates/notifications/modifiedFinalisedNotification.html similarity index 100% rename from dmp-backend/web/src/main/resources/modifiedFinalisedNotification.html rename to dmp-backend/web/src/main/resources/templates/notifications/modifiedFinalisedNotification.html diff --git a/dmp-backend/web/src/main/resources/modifiedNotification.html b/dmp-backend/web/src/main/resources/templates/notifications/modifiedNotification.html similarity index 100% rename from dmp-backend/web/src/main/resources/modifiedNotification.html rename to dmp-backend/web/src/main/resources/templates/notifications/modifiedNotification.html diff --git a/dmp-backend/web/src/main/resources/publishNotification.html b/dmp-backend/web/src/main/resources/templates/notifications/publishNotification.html similarity index 100% rename from dmp-backend/web/src/main/resources/publishNotification.html rename to dmp-backend/web/src/main/resources/templates/notifications/publishNotification.html