when loading service.properties, allow to use ${variable} notation everywhere

SVN: 13770

datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java

@@ -164,7 +164,7 @@ public class Parameters
     {
         try
         {
-            this.serviceProperties = ExtendedProperties.createWith(PropertyParametersUtil.loadServiceProperties());
+            this.serviceProperties = PropertyParametersUtil.loadServiceProperties();
             PropertyUtils.trimProperties(serviceProperties);
             this.threads = createThreadParameters(serviceProperties);
             this.mailProperties = createMailProperties(serviceProperties);

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java

@@ -45,9 +45,9 @@ import ch.systemsx.cisd.common.logging.LogCategory;
 import ch.systemsx.cisd.common.logging.LogFactory;
 import ch.systemsx.cisd.common.logging.LogInitializer;
 import ch.systemsx.cisd.common.utilities.ExtendedProperties;
-import ch.systemsx.cisd.common.utilities.PropertyUtils;
 import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
 import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
+import ch.systemsx.cisd.openbis.dss.generic.shared.utils.PropertyParametersUtil;
 import ch.systemsx.cisd.openbis.generic.shared.IServer;
 
 /**
@@ -172,7 +172,7 @@ public class DataStoreServer
         return thisServer;
     }
 
-    private static SslSocketConnector createSocketConnector(ConfigParameters configParameters)
+    private static SocketConnector createSocketConnector(ConfigParameters configParameters)
     {
         SslSocketConnector socketConnector = new SslSocketConnector();
         socketConnector.setKeystore(configParameters.getKeystorePath());
@@ -205,7 +205,7 @@ public class DataStoreServer
             properties = new Properties();
         } else
         {
-            properties = PropertyUtils.loadProperties(SERVICE_PROPERTIES_FILE);
+            properties = PropertyParametersUtil.loadProperties(SERVICE_PROPERTIES_FILE);
         }
         final Properties systemProperties = System.getProperties();
         final Enumeration<?> propertyNames = systemProperties.propertyNames();

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/AbstractPluginTaskFactory.java

@@ -118,7 +118,8 @@ public abstract class AbstractPluginTaskFactory<T>
         addAll(properties, pluginProperties);
         if (StringUtils.isBlank(parametersFilePath) == false)
         {
-            Properties propertiesFromFile = PropertyUtils.loadProperties(parametersFilePath);
+            Properties propertiesFromFile =
+                    PropertyParametersUtil.loadProperties(parametersFilePath);
             addAll(properties, propertiesFromFile);
         }
         return properties;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/PropertyParametersUtil.java

@@ -44,9 +44,15 @@ public class PropertyParametersUtil
     public static final String ITEMS_DELIMITER = ",";
 
     /** loads server configuration */
-    public static Properties loadServiceProperties()
+    public static ExtendedProperties loadServiceProperties()
     {
-        return PropertyUtils.loadProperties(SERVICE_PROPERTIES_FILE);
+        return loadProperties(SERVICE_PROPERTIES_FILE);
+    }
+
+    public static ExtendedProperties loadProperties(String filePath)
+    {
+        Properties properties = PropertyUtils.loadProperties(filePath);
+        return ExtendedProperties.createWith(properties);
     }
 
     public static String getDataStoreCode(Properties serviceProperties)