From 0dfb3869940db37462a94b910747ac334f35b31b Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Fri, 15 Mar 2024 10:53:44 -0700 Subject: [PATCH 1/5] Be less strict about labkeyServer jar file name --- server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java b/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java index 6b960a0102..3869ecd2ab 100644 --- a/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java +++ b/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java @@ -31,7 +31,7 @@ public EmbeddedExtractor() { File[] files = currentDir.listFiles(file -> { String name = file.getName().toLowerCase(); - return name.endsWith(".jar") && name.contains("labkeyserver"); + return name.endsWith(".jar") && !name.contains("embedded"); }); if (files == null || files.length == 0) From 60d08383e4a8bf0fd1aacff8c5facbc19955db22 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Fri, 15 Mar 2024 10:59:09 -0700 Subject: [PATCH 2/5] Ignore other file that was previously ignored --- server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java b/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java index 3869ecd2ab..5eb891aedf 100644 --- a/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java +++ b/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java @@ -31,7 +31,7 @@ public EmbeddedExtractor() { File[] files = currentDir.listFiles(file -> { String name = file.getName().toLowerCase(); - return name.endsWith(".jar") && !name.contains("embedded"); + return name.endsWith(".jar") && !name.contains("embedded") && !name.contains("labkeybootstrap"); }); if (files == null || files.length == 0) From 5ef2ebefd60015b771885ac6a0ad25fb21ded9b8 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Fri, 15 Mar 2024 13:12:01 -0700 Subject: [PATCH 3/5] Check whether backup exists before attempting to delete --- .../embedded/src/org/labkey/embedded/EmbeddedExtractor.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java b/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java index 5eb891aedf..d171fdf5ba 100644 --- a/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java +++ b/server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java @@ -295,7 +295,10 @@ private void backupExistingDistribution(File webAppLocation) if (toBackup.stream().anyMatch(File::exists)) { File backupDir = new File(verifyJar().getParentFile(), "backup"); - FileUtils.forceDelete(backupDir); // Delete existing backup + if (backupDir.exists()) + { + FileUtils.forceDelete(backupDir); // Delete existing backup + } for (File f : toBackup) { From 05dc8c45c042298b588bbb892add6a32338048bb Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Fri, 15 Mar 2024 13:12:46 -0700 Subject: [PATCH 4/5] Fix typo in application.properties: smtpStartTlsEnable --- server/configs/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/configs/application.properties b/server/configs/application.properties index 7dcb1f116b..9bfd6fb9b9 100644 --- a/server/configs/application.properties +++ b/server/configs/application.properties @@ -70,7 +70,7 @@ mail.smtpPort=@@smtpPort@@ mail.smtpUser=@@smtpUser@@ #mail.smtpFrom=@@smtpFrom@@ #mail.smtpPassword=@@smtpPassword@@ -#mail.startTlsEnable=@@smtpStartTlsEnable@@ +#mail.smtpStartTlsEnable=@@smtpStartTlsEnable@@ #mail.smtpSocketFactoryClass=@@smtpSocketFactoryClass@@ #mail.smtpAuth=@@smtpAuth@@ From 2136be7a3f8f56eccdbf5ea3e2091173d809bf8a Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Fri, 15 Mar 2024 13:43:12 -0700 Subject: [PATCH 5/5] Fix property in the other file too --- server/configs/webapps/embedded/config/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/configs/webapps/embedded/config/application.properties b/server/configs/webapps/embedded/config/application.properties index 7f6567eaba..b88db82cb1 100644 --- a/server/configs/webapps/embedded/config/application.properties +++ b/server/configs/webapps/embedded/config/application.properties @@ -66,7 +66,7 @@ mail.smtpPort=25 mail.smtpUser=Anonymous #mail.smtpFrom=@@smtpFrom@@ #mail.smtpPassword=@@smtpPassword@@ -#mail.startTlsEnable=@@smtpStartTlsEnable@@ +#mail.smtpStartTlsEnable=@@smtpStartTlsEnable@@ #mail.smtpSocketFactoryClass=@@smtpSocketFactoryClass@@ #mail.smtpAuth=@@smtpAuth@@