From d764c6fd13da24dab0435c8260e385e67ab425aa Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 18 Sep 2012 13:25:26 +0000
Subject: [PATCH] SP-182, Bis-109: extracting technology flags from
service.properties if they are not in core_plugins.properties.
SVN: 26663
---
.../izpack/SetTechnologyCheckBoxesAction.java | 5 +++++
.../systemsx/cisd/openbis/installer/izpack/Utils.java | 11 +++++++++++
2 files changed, 16 insertions(+)
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 c9388fdf8ce..807af4afe59 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 f0bc745ebaa..7934a01f09b 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);
--
GitLab