SP-182, Bis-109: extracting technology flags from service.properties if they...

SP-182, Bis-109: extracting technology flags from service.properties if they are not in core_plugins.properties.

SVN: 26663

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());

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);