SSDM-7651: Revert special handling for ELN master data (commit...

SSDM-7651: Revert special handling for ELN master data (commit 6d3471d5)

installation/resource/installer/install.xml

@@ -47,8 +47,6 @@
       <variable name="INSTALL_OPENBIS_TMPEXTRACT" value="$INSTALL_TMPEXTRACT/openBIS-server" />
       <!--  temporary extract folder the "data" contents -->
       <variable name="DATA_TMPEXTRACT" value="$INSTALL_PATH/data-tmp-extract" />
-      <variable name="ELN_MASTER_DATA_PANEL" value="true" condition="isInstallELN+isElnMasterDataNotInstalled" />
-      <variable name="ELN_MASTER_DATA_PANEL" value="false" condition="!isInstallELN|!isElnMasterDataNotInstalled" />
   </dynamicvariables>
 
   <conditions>
@@ -94,21 +92,6 @@
       </java>
       <returnvalue type="boolean">true</returnvalue>
     </condition>
-    <condition type="variable" id="isInstallELN">
-      <name>ELN-LIMS</name>
-      <value>true</value>
-   </condition>
-    <condition type="java" id="isElnMasterDataNotInstalled">
-     <java>
-       <class>ch.systemsx.cisd.openbis.installer.izpack.GlobalInstallationContext</class>
-       <field>isElnMasterDataNotInstalled</field>
-     </java>
-     <returnvalue type="boolean">true</returnvalue>
-    </condition>
-   <condition type="variable" id="shouldShowElnMasterDataPanel">
-        <name>ELN_MASTER_DATA_PANEL</name>
-        <value>true</value>
-    </condition>
   </conditions>
 
   <!-- The panels section. We indicate here which panels we want to use. The order will be respected. -->
@@ -149,9 +132,6 @@
       </actions>
     </panel>
 
-    <panel classname="com.izforge.izpack.panels.userinput.UserInputPanel" id="UserInputPanel.ELN_MASTER_DATA" condition="shouldShowElnMasterDataPanel">
-    </panel>
-
     <panel classname="com.izforge.izpack.panels.userinput.UserInputPanel" id="UserInputPanel.MISC" condition="isFirstTimeInstallation">
       <actions>
         <action stage="postvalidate" classname="ch.systemsx.cisd.openbis.installer.izpack.SetHostnameVariableAction" />
@@ -177,7 +157,6 @@
       <actions>
         <action stage="postvalidate" classname="ch.systemsx.cisd.openbis.installer.izpack.ExecuteSetupScriptsAction" />
         <action stage="postvalidate" classname="ch.systemsx.cisd.openbis.installer.izpack.OpenGettingStartedPageAction" />
-        <action stage="postvalidate" classname="ch.systemsx.cisd.openbis.installer.izpack.ELNMasterDataAction" />
       </actions>
     </panel>
     

installation/resource/installer/userInputSpec.xml

@@ -73,18 +73,6 @@
     </field>
   </panel>
   
-  <panel id="UserInputPanel.ELN_MASTER_DATA">
-    <field type="title" txt="ELN/LIMS master data" bold="true" size="2" />
-
-    <field type="radio" variable="ELN-LIMS-MASTER-DATA">
-      <description align="left" txt="Install ELN/LIMS default entity types (PLASMID, YEAST, FLY, etc.)?" />
-      <spec>
-          <choice txt="Yes" value="true" set="true"/>
-          <choice txt="No" value="false"/>
-      </spec>
-    </field>
-  </panel>
-  
   <panel id="UserInputPanel.MISC">
     <field type="title" txt="Misc" bold="true" size="2" />
     <field type="password" align="left" variable="ADMIN_PASSWORD">

installation/resource/tarball/console.properties

@@ -53,9 +53,6 @@ KEY_PASSWORD = changeit
 # 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
-
 #
 # Comma-separated list of databases to backup. If the list is empty or undefined all databases
 # will be backauped.

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

-/*
- * Copyright 2011 ETH Zuerich, CISD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.systemsx.cisd.openbis.installer.izpack;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.izforge.izpack.api.data.AutomatedInstallData;
-import com.izforge.izpack.api.data.PanelActionConfiguration;
-
-/**
- * Executes a script that removes eln master data python script, if required.
- */
-public class ELNMasterDataAction extends AbstractScriptExecutor
-{
-    /**
-     * a script that creates a installation backup.
-     */
-    private static final String ELN_MASTER_DATA_SCRIPT = "disable-eln-master-data-script.sh";
-
-    @Override
-    public synchronized void executeAction(AutomatedInstallData data)
-    {
-        String script = getAdminScript(data, ELN_MASTER_DATA_SCRIPT);
-
-        String elnMasterDataEnabled = data.getVariable("ELN-LIMS-MASTER-DATA");
-
-        if (elnMasterDataEnabled != null)
-        {
-            Map<String, String> env = new HashMap<String, String>();
-            env.put("ELN_MASTER_DATA", elnMasterDataEnabled);
-            executeAdminScript(env, script);
-        }
-    }
-
-    @Override
-    public void initialize(PanelActionConfiguration arg0)
-    {
-    }
-
-}

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

@@ -88,8 +88,6 @@ public class GlobalInstallationContext
 
     public static File installDir;
 
-    public static boolean isElnMasterDataNotInstalled = false;
-
     public static void initialize(AutomatedInstallData data)
     {
         String installPath = data.getInstallPath();
@@ -123,14 +121,6 @@ public class GlobalInstallationContext
         {
             populateFirstTimeInstallVariables(data);
         }
-
-        isElnMasterDataNotInstalled = (isFirstTimeInstallation == true) ||
-                ((new File(installDir, "servers/core-plugins/eln-lims/1/as/initialize-master-data.py").exists() == false) &&
-                        (new File(installDir, "servers/core-plugins/eln-lims/1/as/initializemasterdataminimum.py").exists() == false))
-                ||
-                ((new File(installDir, "servers/core-plugins/eln-lims/1/as/.eln-master-data-installed").exists() == false) &&
-                        (new File(installDir, "servers/core-plugins/eln-lims/1/as/initializemasterdataminimum.py").exists() == true));
-
     }
 
     private static boolean installationExists()