Skip to content

Remove useEmbeddedTomcat property and other support for standalone #2038

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-adam merged 2 commits into from
Sep 6, 2024
Merged

Remove useEmbeddedTomcat property and other support for standalone #2038

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
54109d2
Remove useEmbeddedTomcat property and other support for standalone bu…
labkey-adam Sep 4, 2024
2037ee5
Delete unused method
labkey-adam Sep 4, 2024
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: 0 additions & 1 deletion distributions/teamcity/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ project.tasks.register("distribution", ModuleDistribution) {
dist.description = "Make a LabKey modules distribution for 'test'"

dist.subDirName = "test"
dist.embeddedArchiveType = "tar.gz"
dist.extraFileIdentifier = '-test'
dist.versionPrefix = 'Test'
}
Expand Down
11 changes: 2 additions & 9 deletions src/org/labkey/test/TestFileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,7 @@ else if (!new File(_labkeyRoot, "server").exists())

public static File getServerLogDir()
{
if (TestProperties.isEmbeddedTomcat())
{
return new File(getDefaultDeployDir(), "embedded/logs");
}
else
{
return new File(TestProperties.getTomcatHome(), "logs");
}
return new File(getDefaultDeployDir(), "embedded/logs");
}

public static File getTestRoot()
Expand Down Expand Up @@ -217,7 +210,7 @@ public static File getModulesDir()
if (_modulesDir == null)
{
_modulesDir = new File(getDefaultDeployDir(), "modules");
if (TestProperties.isEmbeddedTomcat() && !_modulesDir.isDirectory())
if (!_modulesDir.isDirectory())
{
// Module root when deploying from embedded distribution
_modulesDir = new File(getDefaultDeployDir(), "embedded/modules");
Expand Down
14 changes: 0 additions & 14 deletions src/org/labkey/test/TestProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,6 @@ public static boolean isTrialServer()
return "true".equals(System.getProperty("webtest.server.trial"));
}

public static boolean isEmbeddedTomcat()
{
return !System.getProperty("useEmbeddedTomcat", "false").equals("false") || new File(TestFileUtils.getDefaultDeployDir(), "embedded").isDirectory();
}

public static boolean isCheckerFatal()
{
return "true".equals(System.getProperty("webtest.checker.fatal"));
Expand Down Expand Up @@ -267,15 +262,6 @@ public static int getServerStartupTimeout()
}
}

public static File getTomcatHome()
{
String tomcatHome = System.getProperty("tomcat.home", System.getenv("CATALINA_HOME"));
if (tomcatHome != null && !tomcatHome.isEmpty())
return new File(tomcatHome);
else
return null;
}

public static String getAdditionalPipelineTools()
{
return System.getProperty("additional.pipeline.tools");
Expand Down