SSDM-4098 : Microscopy, Flow Cytometry and Shared plugins for openBIS installer (installer)

SVN: 37139

installation/resource/installer/userInputSpec.xml

@@ -65,6 +65,12 @@
     <field type="check" variable="ELN-LIMS">
       <spec txt="ELN/LIMS" true="true" false="false"/>
     </field>
+    <field type="check" variable="MICROSCOPY">
+      <spec txt="Microscopy" true="true" false="false"/>
+    </field>
+    <field type="check" variable="FLOW">
+      <spec txt="Flow Cytometry" true="true" false="false"/>
+    </field>
     
     <field type="space"/>
     <field type="staticText" align="left"

installation/resource/tarball/console.properties

@@ -47,6 +47,12 @@ KEY_PASSWORD = changeit
 # Standard technology ELN-LIMS is disabled by default
 #ELN-LIMS = true
 
+# Standard technology MICROSCOPY is disabled by default
+#MICROSCOPY = true
+
+# Standard technology FLOW CYTOMETRY is disabled by default
+#FLOW = true
+
 # Full ELN/LIMS master data is enabled by default. This setting is meaningful only if ELN-LIMS is enabled
 #ELN-LIMS-MASTER-DATA = false
 

installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/GlobalInstallationContext.java

@@ -52,10 +52,17 @@ public class GlobalInstallationContext
 
     public static final String TECHNOLOGY_ELN_LIMS = "ELN-LIMS";
 
+    public static final String TECHNOLOGY_MICROSCOPY = "MICROSCOPY";
+
+    public static final String TECHNOLOGY_FLOW_CYTOMETRY = "FLOW";
+
+    public static final String TECHNOLOGY_SHARED_MICROSCOPY_FLOW_CYTOMETRY = "SHARED";
+
     public static final String PATHINFO_DB_ENABLED = "PATHINFO_DB_ENABLED";
 
     public static final String[] TECHNOLOGIES =
-            { TECHNOLOGY_PROTEOMICS, TECHNOLOGY_SCREENING, TECHNOLOGY_ILLUMINA_NGS, TECHNOLOGY_ELN_LIMS };
+            { TECHNOLOGY_PROTEOMICS, TECHNOLOGY_SCREENING, TECHNOLOGY_ILLUMINA_NGS, TECHNOLOGY_ELN_LIMS, TECHNOLOGY_MICROSCOPY,
+                    TECHNOLOGY_FLOW_CYTOMETRY };
 
     /**
      * set to true if the installation process is trying to update an existing openBIS installation.

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 = {"dropbox-monitor", "dataset-uploader", "dataset-file-search"};
+    private static final String[] MODULES = { "dropbox-monitor", "dataset-uploader", "dataset-file-search" };
 
     static final String ENABLED_TECHNOLOGIES_VARNAME = "ENABLED_TECHNOLOGIES";
 
@@ -106,8 +106,17 @@ public class SetEnableTechnologiesVariableAction implements PanelAction
             if (Boolean.TRUE.toString().equalsIgnoreCase(technologyFlag))
             {
                 builder.append(lowerCasedTechnology);
+
+                if (technology == GlobalInstallationContext.TECHNOLOGY_MICROSCOPY ||
+                        technology == GlobalInstallationContext.TECHNOLOGY_FLOW_CYTOMETRY)
+                {
+                    String lowerCasedTechnologyShared = GlobalInstallationContext.TECHNOLOGY_SHARED_MICROSCOPY_FLOW_CYTOMETRY.toLowerCase();
+                    builder.append(lowerCasedTechnologyShared);
+                    allTechnologies.add(lowerCasedTechnologyShared);
+                }
             }
         }
+
         Properties properties = Utils.tryToGetProperties(configFile);
         if (properties != null)
         {