From 31ab5f1d4cf8951420430e9d14f063ba745f13c1 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 2 Jul 2012 07:01:08 +0000
Subject: [PATCH] SP-167, BIS-81: bug fixed: Different default core plugin
folder paths for AS and DSS
SVN: 25958
---
.../generic/shared/coreplugin/CorePluginsInjector.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjector.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjector.java
index 3b207efb0f0..5c397aa3d43 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjector.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjector.java
@@ -62,6 +62,8 @@ public class CorePluginsInjector
public static final String DEFAULT_CORE_PLUGINS_FOLDER = "../core-plugins";
+ public static final String DEFAULT_AS_CORE_PLUGINS_FOLDER = "../../core-plugins";
+
static final String DISABLED_CORE_PLUGINS_KEY = "disabled-core-plugins";
static final String DISABLED_MARKER_FILE_NAME = "disabled";
@@ -102,8 +104,11 @@ public class CorePluginsInjector
public void injectCorePlugins(Properties properties)
{
+ String defaultCorePluginsFolder =
+ scannerType == ScannerType.DSS ? DEFAULT_CORE_PLUGINS_FOLDER
+ : DEFAULT_AS_CORE_PLUGINS_FOLDER;
String corePluginsFolderPath =
- properties.getProperty(CORE_PLUGINS_FOLDER_KEY, DEFAULT_CORE_PLUGINS_FOLDER);
+ properties.getProperty(CORE_PLUGINS_FOLDER_KEY, defaultCorePluginsFolder);
injectCorePlugins(properties, corePluginsFolderPath);
}
--
GitLab