diff --git a/installation/resource/installer/userInputSpec.xml b/installation/resource/installer/userInputSpec.xml index 8e4bd58e81c47de30da0c9dded892c7cc5a5ae7f..5352a108a56176445a043b43f1d53d744b1dc4a7 100644 --- a/installation/resource/installer/userInputSpec.xml +++ b/installation/resource/installer/userInputSpec.xml @@ -65,6 +65,9 @@ <field type="check" variable="ELN-LIMS"> <spec txt="ELN/LIMS" true="true" false="false"/> </field> + <field type="check" variable="ELN-LIMS-LIFE-SCIENCES"> + <spec txt="ELN/LIMS Life Sciences Types" true="true" false="false"/> + </field> <field type="check" variable="MICROSCOPY"> <spec txt="Microscopy" true="true" false="false"/> </field> diff --git a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/GlobalInstallationContext.java b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/GlobalInstallationContext.java index 36b165db5fb44de8b669abdb004941f860994e38..e5fcd85065442ac14c422842e47fc1fde3938203 100644 --- a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/GlobalInstallationContext.java +++ b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/GlobalInstallationContext.java @@ -52,6 +52,8 @@ public class GlobalInstallationContext public static final String TECHNOLOGY_ELN_LIMS = "ELN-LIMS"; + public static final String TECHNOLOGY_ELN_LIMS_LIFE_SCIENCES = "ELN-LIMS-LIFE-SCIENCES"; + public static final String TECHNOLOGY_MICROSCOPY = "MICROSCOPY"; public static final String TECHNOLOGY_FLOW_CYTOMETRY = "FLOW"; @@ -60,7 +62,7 @@ public class GlobalInstallationContext public static final String[] TECHNOLOGIES = { TECHNOLOGY_PROTEOMICS, TECHNOLOGY_SCREENING, TECHNOLOGY_ILLUMINA_NGS, TECHNOLOGY_ELN_LIMS, TECHNOLOGY_MICROSCOPY, - TECHNOLOGY_FLOW_CYTOMETRY }; + TECHNOLOGY_FLOW_CYTOMETRY, TECHNOLOGY_ELN_LIMS_LIFE_SCIENCES }; /** * set to true if the installation process is trying to update an existing openBIS installation. diff --git a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableAction.java b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableAction.java index 822b8ef6e9f5c83345269ebba722e7812778ae21..01c5568652f434566fe73d84790e43bd9d3095af 100644 --- a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableAction.java +++ b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableAction.java @@ -37,7 +37,7 @@ import ch.systemsx.cisd.common.shared.basic.string.CommaSeparatedListBuilder; */ public class SetEnableTechnologiesVariableAction implements PanelAction { - private static final String[] MODULES = { "monitoring-support", "dropbox-monitor", "dataset-uploader", "dataset-file-search" }; + private static final String[] MODULES = { "monitoring-support", "dropbox-monitor", "dataset-uploader", "dataset-file-search", "xls-import" }; static final String ENABLED_TECHNOLOGIES_VARNAME = "ENABLED_TECHNOLOGIES"; diff --git a/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableActionTest.java b/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableActionTest.java index 32a8c1b4ec8f6cc2ba48395e14ab5afb4f55d635..d5b3bbe3ea032dbf198e10bc958bed70bf658e1c 100644 --- a/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableActionTest.java +++ b/installation/sourceTest/java/ch/systemsx/cisd/openbis/installer/izpack/SetEnableTechnologiesVariableActionTest.java @@ -93,7 +93,7 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT variables.setProperty(TECHNOLOGY_SCREENING, "true"); updateEnabledTechnologyProperties(variables, false); - assertEquals("[, enabled-modules = monitoring-support, dropbox-monitor, dataset-uploader, dataset-file-search, screening]", + assertEquals("[, enabled-modules = monitoring-support, dropbox-monitor, dataset-uploader, dataset-file-search, xls-import, screening]", FileUtilities.loadToStringList(corePluginsProperties).toString()); } @@ -101,7 +101,7 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT public void testUpdateInstallationWithOtherEnabledTechnologiesInAs() { FileUtilities.writeToFile(corePluginsProperties, "abc = 123\n" + ENABLED_TECHNOLOGIES_KEY - + "=monitoring-support, dropbox-monitor, dataset-uploader, dataset-file-search, proteomics, my-tech"); + + "=monitoring-support, dropbox-monitor, dataset-uploader, dataset-file-search, xls-import, proteomics, my-tech"); Properties variables = new Properties(); variables.setProperty(TECHNOLOGY_PROTEOMICS, "true"); variables.setProperty(TECHNOLOGY_SCREENING, "false"); @@ -109,7 +109,7 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT updateEnabledTechnologyProperties(variables, false); assertEquals("[abc = 123, " + ENABLED_TECHNOLOGIES_KEY + "=monitoring-support, dropbox-monitor, dataset-uploader, " - + "dataset-file-search, proteomics, my-tech]", + + "dataset-file-search, xls-import, proteomics, my-tech]", FileUtilities.loadToStringList(corePluginsProperties).toString()); } @@ -117,7 +117,7 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT public void testUpdateUnchangedProperty() { FileUtilities.writeToFile(corePluginsProperties, "abc = 123\n" + ENABLED_TECHNOLOGIES_KEY - + "=monitoring-support, dropbox-monitor, dataset-uploader, dataset-file-search, proteomics"); + + "=monitoring-support, dropbox-monitor, dataset-uploader, dataset-file-search, xls-import, proteomics"); Properties variables = new Properties(); variables.setProperty(TECHNOLOGY_PROTEOMICS, "true"); variables.setProperty(TECHNOLOGY_SCREENING, "false"); @@ -125,8 +125,9 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT updateEnabledTechnologyProperties(variables, false); assertEquals("[abc = 123, " + ENABLED_TECHNOLOGIES_KEY + "=monitoring-support, dropbox-monitor, dataset-uploader, " - + "dataset-file-search, proteomics]", FileUtilities - .loadToStringList(corePluginsProperties).toString()); + + "dataset-file-search, xls-import, proteomics]", + FileUtilities + .loadToStringList(corePluginsProperties).toString()); } @Test @@ -141,7 +142,7 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT updateEnabledTechnologyProperties(variables, false); assertEquals("[abc = 123, " + ENABLED_TECHNOLOGIES_KEY + " = monitoring-support, dropbox-monitor, dataset-uploader, " - + "dataset-file-search, proteomics, screening, answer = 42]", + + "dataset-file-search, xls-import, proteomics, screening, answer = 42]", FileUtilities .loadToStringList(corePluginsProperties).toString()); } @@ -157,8 +158,9 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT updateEnabledTechnologyProperties(variables, false); assertEquals("[abc = 123, " + ENABLED_TECHNOLOGIES_KEY + " = monitoring-support, dropbox-monitor, dataset-uploader, " - + "dataset-file-search, screening]", FileUtilities - .loadToStringList(corePluginsProperties).toString()); + + "dataset-file-search, xls-import, screening]", + FileUtilities + .loadToStringList(corePluginsProperties).toString()); } @Test @@ -173,7 +175,7 @@ public class SetEnableTechnologiesVariableActionTest extends AbstractFileSystemT updateEnabledTechnologyProperties(variables, false); assertEquals("[a = b, " + ENABLED_TECHNOLOGIES_KEY + " = monitoring-support, dropbox-monitor, dataset-uploader, " - + "dataset-file-search, screening, gamma = alpha]", + + "dataset-file-search, xls-import, screening, gamma = alpha]", FileUtilities.loadToStringList(corePluginsProperties).toString()); }