Skip to content
Snippets Groups Projects
Commit ea58d7d7 authored by anttil's avatar anttil
Browse files

SSDM-2515: Allow absolute paths in DSS service property "core-plugins-folder".

SVN: 36272
parent 93f723b3
No related branches found
No related tags found
No related merge requests found
...@@ -33,8 +33,7 @@ import ch.systemsx.cisd.openbis.generic.shared.coreplugin.CorePluginsInjector; ...@@ -33,8 +33,7 @@ import ch.systemsx.cisd.openbis.generic.shared.coreplugin.CorePluginsInjector;
import ch.systemsx.cisd.openbis.generic.shared.coreplugin.CorePluginsUtils; import ch.systemsx.cisd.openbis.generic.shared.coreplugin.CorePluginsUtils;
/** /**
* Given a list of properties files generates a list of well-known databases to be backed up as part * Given a list of properties files generates a list of well-known databases to be backed up as part of the openBIS upgrade process.
* of the openBIS upgrade process.
* *
* @author Kaloyan Enimanev * @author Kaloyan Enimanev
*/ */
...@@ -95,10 +94,15 @@ public class BackupDatabaseDescriptionGenerator ...@@ -95,10 +94,15 @@ public class BackupDatabaseDescriptionGenerator
Properties properties = PropertyIOUtils.loadProperties(propertiesFile); Properties properties = PropertyIOUtils.loadProperties(propertiesFile);
if (isDSSPropertiesFile(propertiesFile)) if (isDSSPropertiesFile(propertiesFile))
{ {
String corePluginsFolderRelativePath = String corePluginsFolderLocation =
CorePluginsUtils.getCorePluginsFolder(properties, ScannerType.DSS); CorePluginsUtils.getCorePluginsFolder(properties, ScannerType.DSS);
File workingDirectory = propertiesFile.getParentFile().getParentFile(); File workingDirectory = propertiesFile.getParentFile().getParentFile();
File corePluginsFolder = new File(workingDirectory, corePluginsFolderRelativePath);
File corePluginsFolder = new File(corePluginsFolderLocation);
if (corePluginsFolder.isAbsolute() == false)
{
corePluginsFolder = new File(workingDirectory, corePluginsFolderLocation);
}
File file = new File(corePluginsFolder, CorePluginsUtils.CORE_PLUGINS_PROPERTIES_FILE); File file = new File(corePluginsFolder, CorePluginsUtils.CORE_PLUGINS_PROPERTIES_FILE);
PropertyIOUtils.loadAndAppendProperties(properties, file); PropertyIOUtils.loadAndAppendProperties(properties, file);
CorePluginsInjector injector = CorePluginsInjector injector =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment