From 77f8d4767f098886968a6105897b1ea6abd26a33 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Mon, 2 Jun 2025 16:46:06 -0700 Subject: [PATCH 1/2] Issue 53209: Allow externalModules folder to be dictated via application.properties file --- server/configs/application.properties | 1 + .../src/org/labkey/embedded/LabKeyServer.java | 12 ++++++++++++ .../LabKeyTomcatServletWebServerFactory.java | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/server/configs/application.properties b/server/configs/application.properties index 2cdc072243..d93fe5a6f4 100644 --- a/server/configs/application.properties +++ b/server/configs/application.properties @@ -58,6 +58,7 @@ context.encryptionKey=@@encryptionKey@@ #context.additionalWebapps.firstContextPath=/my/webapp/path #context.additionalWebapps.secondContextPath=/my/other/webapp/path +context.externalModules=/Users/jeckels/externalModules #context.requiredModules= #context.pipelineConfig=/path/to/pipeline/config/dir #context.serverGUID= diff --git a/server/embedded/src/org/labkey/embedded/LabKeyServer.java b/server/embedded/src/org/labkey/embedded/LabKeyServer.java index 0ed7ce5d14..54057d5750 100644 --- a/server/embedded/src/org/labkey/embedded/LabKeyServer.java +++ b/server/embedded/src/org/labkey/embedded/LabKeyServer.java @@ -431,6 +431,8 @@ public static class ContextProperties private String contextPath = ""; private String pipelineConfig; private String requiredModules; + /** Path to external modules directory */ + private String externalModules; private boolean bypass2FA = false; private String serverGUID; private Integer httpPort; @@ -576,6 +578,16 @@ public void setRequiredModules(String requiredModules) this.requiredModules = requiredModules; } + public String getExternalModules() + { + return externalModules; + } + + public void setExternalModules(String externalModules) + { + this.externalModules = externalModules; + } + public boolean isBypass2FA() { return bypass2FA; diff --git a/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java b/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java index d70bb4b16f..a02a5312e1 100644 --- a/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java +++ b/server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java @@ -175,6 +175,11 @@ protected TomcatWebServer getTomcatWebServer(Tomcat tomcat) { context.addParameter("requiredModules", contextProperties.getRequiredModules()); } + if (contextProperties.getExternalModules() != null) + { + // We've long supported configuring this via a system property so propagate the value + System.setProperty("labkey.externalModulesDir", contextProperties.getExternalModules()); + } if (contextProperties.getPipelineConfig() != null) { context.addParameter("org.labkey.api.pipeline.config", contextProperties.getPipelineConfig()); From 9dc6b1012f9eed331d77d0535c4c86dbf1f04de5 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Mon, 2 Jun 2025 16:46:43 -0700 Subject: [PATCH 2/2] Better placeholder value for new property --- 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 d93fe5a6f4..8f85e56fca 100644 --- a/server/configs/application.properties +++ b/server/configs/application.properties @@ -58,7 +58,7 @@ context.encryptionKey=@@encryptionKey@@ #context.additionalWebapps.firstContextPath=/my/webapp/path #context.additionalWebapps.secondContextPath=/my/other/webapp/path -context.externalModules=/Users/jeckels/externalModules +#context.externalModules=/path/to/external/modules/dir #context.requiredModules= #context.pipelineConfig=/path/to/pipeline/config/dir #context.serverGUID=