From 54109d2f8c21b370aa856f18207f140451b6aa75 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Tue, 3 Sep 2024 17:29:03 -0700
Subject: [PATCH 1/2] Remove useEmbeddedTomcat property and other support for
 standalone builds

---
 distributions/teamcity/build.gradle     |  1 -
 src/org/labkey/test/TestFileUtils.java  | 11 ++---------
 src/org/labkey/test/TestProperties.java |  5 -----
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/distributions/teamcity/build.gradle b/distributions/teamcity/build.gradle
index 87a054209a..a212c91c4d 100644
--- a/distributions/teamcity/build.gradle
+++ b/distributions/teamcity/build.gradle
@@ -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'
 }
diff --git a/src/org/labkey/test/TestFileUtils.java b/src/org/labkey/test/TestFileUtils.java
index 44898d2e16..527bf5c3c1 100644
--- a/src/org/labkey/test/TestFileUtils.java
+++ b/src/org/labkey/test/TestFileUtils.java
@@ -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()
@@ -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");
diff --git a/src/org/labkey/test/TestProperties.java b/src/org/labkey/test/TestProperties.java
index 150f5203a2..d267274e4b 100644
--- a/src/org/labkey/test/TestProperties.java
+++ b/src/org/labkey/test/TestProperties.java
@@ -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"));

From 2037ee504b756efa2ca1cc350826cbf58ffd5882 Mon Sep 17 00:00:00 2001
From: Adam Rauch <adam@labkey.com>
Date: Wed, 4 Sep 2024 10:37:20 -0700
Subject: [PATCH 2/2] Delete unused method

---
 src/org/labkey/test/TestProperties.java | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/org/labkey/test/TestProperties.java b/src/org/labkey/test/TestProperties.java
index d267274e4b..491efc30db 100644
--- a/src/org/labkey/test/TestProperties.java
+++ b/src/org/labkey/test/TestProperties.java
@@ -262,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");