Merge 25.11 to develop

Author: labkey-teamcity

flow/src/org/labkey/flow/controllers/executescript/AnalysisScriptController.java

@@ -54,6 +54,7 @@
 import org.labkey.api.view.HttpView;
 import org.labkey.api.view.JspView;
 import org.labkey.api.view.NavTree;
+import org.labkey.api.view.NotFoundException;
 import org.labkey.api.view.RedirectException;
 import org.labkey.api.view.ViewBackgroundInfo;
 import org.labkey.api.view.template.PageConfig;
@@ -95,6 +96,7 @@
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -370,8 +372,15 @@ protected ModelAndView confirmRuns(ImportRunsForm form, BindException errors)
         {
             validatePipeline();
 
-            collectNewPaths(form, errors);
-            return new JspView<PipelinePathForm>("/org/labkey/flow/controllers/executescript/confirmRunsToImport.jsp", form, errors);
+            try
+            {
+                collectNewPaths(form, errors);
+                return new JspView<PipelinePathForm>("/org/labkey/flow/controllers/executescript/confirmRunsToImport.jsp", form, errors);
+            }
+            catch (InvalidPathException e)
+            {
+                throw new NotFoundException(e.getMessage());
+            }
         }
 
         protected ModelAndView uploadRuns(ImportRunsForm form, BindException errors) throws Exception
@@ -985,7 +994,7 @@ private void accelerateWizard(ImportAnalysisForm form, BindException errors, Run
 
             // Set the data folder if we aren't using an existing run
             if (SelectFCSFileOption.None == form.getSelectFCSFilesOption())
-                form.setKeywordDir(new String[]{getWorkspaceFolder(form).toString()});
+                form.setKeywordDir(new String[]{getPipeRoot().relativePath(getWorkspaceFolder(form))});
 
             // Select FCS file (by default we already select all fcs files in working folder)
             stepSelectFCSFiles(form, errors);

protein/src/org/labkey/protein/ProteinModule.java

@@ -20,15 +20,15 @@
 import org.jetbrains.annotations.Nullable;
 import org.labkey.api.data.Container;
 import org.labkey.api.data.ContainerManager;
-import org.labkey.api.data.DatabaseMigrationConfiguration;
-import org.labkey.api.data.DatabaseMigrationService;
-import org.labkey.api.data.DatabaseMigrationService.DefaultMigrationSchemaHandler;
 import org.labkey.api.data.DbSchema;
 import org.labkey.api.data.SqlExecutor;
 import org.labkey.api.data.TableInfo;
 import org.labkey.api.data.TableSelector;
 import org.labkey.api.files.FileContentService;
 import org.labkey.api.files.TableUpdaterFileListener;
+import org.labkey.api.migration.DatabaseMigrationConfiguration;
+import org.labkey.api.migration.DatabaseMigrationService;
+import org.labkey.api.migration.DefaultMigrationSchemaHandler;
 import org.labkey.api.module.DefaultModule;
 import org.labkey.api.module.ModuleContext;
 import org.labkey.api.pipeline.PipelineService;