Skip to content

Issue 53209: Allow externalModules folder to be dictated via application.properties file #1083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 2 commits into from
Jun 4, 2025
Merged

Issue 53209: Allow externalModules folder to be dictated via application.properties file #1083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77f8d47
Issue 53209: Allow externalModules folder to be dictated via applicat…
labkey-jeckels Jun 2, 2025
9dc6b10
Better placeholder value for new property
labkey-jeckels Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions server/configs/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ context.encryptionKey=@@encryptionKey@@
#context.additionalWebapps.firstContextPath=/my/webapp/path
#context.additionalWebapps.secondContextPath=/my/other/webapp/path

#context.externalModules=/path/to/external/modules/dir
#context.requiredModules=
#context.pipelineConfig=/path/to/pipeline/config/dir
#context.serverGUID=
Expand Down
12 changes: 12 additions & 0 deletions server/embedded/src/org/labkey/embedded/LabKeyServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down