diff --git a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetTechnologyCheckBoxesAction.java b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetTechnologyCheckBoxesAction.java index c9388fdf8ced4118f1ba76440e5967aefef49bb3..807af4afe59ee9758d9bac0ed44cd9cb27e14eb1 100644 --- a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetTechnologyCheckBoxesAction.java +++ b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/SetTechnologyCheckBoxesAction.java @@ -65,6 +65,11 @@ public class SetTechnologyCheckBoxesAction implements PanelAction { String technologies = Utils.tryToGetCorePluginsPropertyOfAS(installDir, ENABLED_TECHNOLOGIES_KEY); + if (technologies == null) + { + technologies = + Utils.tryToGetServicePropertyOfAS(installDir, ENABLED_TECHNOLOGIES_KEY); + } if (technologies != null) { return technologies.contains(technologyName.toLowerCase()); diff --git a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/Utils.java b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/Utils.java index f0bc745ebaa4743b2cebb0af34eae257002c51d3..7934a01f09bce94b23299358a0580057b5bf0f21 100644 --- a/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/Utils.java +++ b/installation/source/java/ch/systemsx/cisd/openbis/installer/izpack/Utils.java @@ -52,6 +52,12 @@ class Utils return new File(installDir, CORE_PLUGINS_PATH).isDirectory(); } + static String tryToGetServicePropertyOfAS(File installDir, String propertyKey) + { + Properties serviceProperties = tryToGetServicePropertiesOfAS(installDir); + return serviceProperties == null ? null : serviceProperties.getProperty(propertyKey); + } + static String tryToGetCorePluginsPropertyOfAS(File installDir, String propertyKey) { Properties serviceProperties = tryToGetCorePluginsPropertiesOfAS(installDir); @@ -88,6 +94,11 @@ class Utils return false; } + private static Properties tryToGetServicePropertiesOfAS(File installDir) + { + return tryToGetServiceProperties(installDir, AS_PATH + SERVICE_PROPERTIES_PATH); + } + private static Properties tryToGetCorePluginsPropertiesOfAS(File installDir) { return tryToGetServiceProperties(installDir, AS_PATH + CORE_PLUGINS_PROPERTIES_PATH);