Reapplying changes after git re-migration

Author: Sigmonia

LDK/test/src/org/labkey/test/tests/external/labModules/LabModulesTest.java

@@ -808,7 +808,7 @@ private void tabbedReportsTest()
 
     private void dataSourcesTest() throws Exception
     {
-        goToAdminConsole().goToAdminConsoleLinksSection();
+        goToAdminConsole().goToSettingsSection();
         waitAndClickAndWait(Locator.linkContainingText("discvr admin"));
         waitAndClickAndWait(Locator.linkContainingText("Manage Default Data and Demographics Sources"));
         waitForText("You are currently editing the data and demographics sources for the Shared project");  //proxy for data loading
@@ -944,7 +944,7 @@ private void dataSourcesTest() throws Exception
         _customizeViewsHelper.revertUnsavedViewGridClosed();
 
         //now validate site-summary reports
-        goToAdminConsole().goToAdminConsoleLinksSection();
+        goToAdminConsole().goToSettingsSection();
         waitAndClickAndWait(Locator.linkContainingText("discvr admin"));
         waitAndClickAndWait(Locator.linkContainingText("Manage Default Data and Demographics Sources"));
 
@@ -1132,7 +1132,7 @@ private void settingsTest()
     private void siteSettingsTest()
     {
         log("Testing Site Settings");
-        goToAdminConsole().goToAdminConsoleLinksSection();
+        goToAdminConsole().goToSettingsSection();
         waitAndClickAndWait(Locator.linkContainingText("discvr admin"));
 
         waitForText("Reference Sequences"); //proxy for page load

laboratory/build.gradle

@@ -1,6 +1,6 @@
 import org.labkey.gradle.util.BuildUtils;
 
 dependencies {
-    BuildUtils.addLabKeyDependency(project: project, config: "compile", depProjectPath: ":externalModules:labModules:LDK", depProjectConfig: "apiCompile")
+    BuildUtils.addLabKeyDependency(project: project, config: "compile", depProjectPath: ":server:modules:LabDevKitModules:LDK", depProjectConfig: "apiCompile")
     BuildUtils.addLabKeyDependency(project: project, config: "compile", depProjectPath: BuildUtils.getPlatformModuleProjectPath(project.gradle, "assay"), depProjectConfig: "apiCompile")
 }

laboratory/src/org/labkey/laboratory/LaboratoryContainerListener.java

@@ -179,7 +179,7 @@ else if (evt.getPropertyName().equals(ContainerManager.Property.Policy.name()))
     }
 
     @Override
-    protected void purgeTable(UserSchema userSchema, TableInfo table, Container c, User u)
+    protected void purgeTable(UserSchema userSchema, TableInfo table, Container c)
     {
         if (table.getName().equalsIgnoreCase(LaboratorySchema.TABLE_WORKBOOKS))
         {
@@ -191,7 +191,7 @@ protected void purgeTable(UserSchema userSchema, TableInfo table, Container c, U
         }
         else
         {
-            super.purgeTable(userSchema, table, c, u);
+            super.purgeTable(userSchema, table, c);
         }
     }
 }