From 828e8ec36d821d51484134e118cd2aafe2be01a4 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 6 Mar 2012 09:17:44 +0000
Subject: [PATCH] LMS-2818 add plugin type IMAGE_OVERVIEW_PLUGINS
SVN: 24621
---
.../generic/server/DatasetImageOverviewConfiguration.java | 5 ++---
.../systemsx/cisd/openbis/dss/generic/shared/Constants.java | 2 ++
.../dss/generic/shared/utils/CorePluginsInjector.java | 1 +
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetImageOverviewConfiguration.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetImageOverviewConfiguration.java
index 4ca3699e385..d20d87440b5 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetImageOverviewConfiguration.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DatasetImageOverviewConfiguration.java
@@ -28,14 +28,13 @@ import ch.systemsx.cisd.common.utilities.ClassUtils;
import ch.systemsx.cisd.common.utilities.PropertyParametersUtil;
import ch.systemsx.cisd.common.utilities.PropertyParametersUtil.SectionProperties;
import ch.systemsx.cisd.common.utilities.PropertyUtils;
+import ch.systemsx.cisd.openbis.dss.generic.shared.Constants;
/**
* @author Piotr Buczek
*/
public class DatasetImageOverviewConfiguration
{
- private static String PLUGINS_SERVICES_LIST_KEY = "overview-plugins";
-
private static final String PLUGIN_SERVICE_CLASS_KEY = "class";
private static final String PLUGIN_SERVICE_DEFAULT_KEY = "default";
@@ -48,7 +47,7 @@ public class DatasetImageOverviewConfiguration
SectionProperties[] pluginServicesProperties =
PropertyParametersUtil.extractSectionProperties(properties,
- PLUGINS_SERVICES_LIST_KEY, false);
+ Constants.OVERVIEW_PLUGINS_SERVICES_LIST_KEY, false);
for (SectionProperties sectionProperties : pluginServicesProperties)
{
Properties props = sectionProperties.getProperties();
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/Constants.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/Constants.java
index 27231b5d6cf..1b5fe90e9ed 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/Constants.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/Constants.java
@@ -42,4 +42,6 @@ public class Constants
/** Key of service property which is a list of servlet services. */
public static final String PLUGIN_SERVICES_LIST_KEY = "plugin-services";
+ public static String OVERVIEW_PLUGINS_SERVICES_LIST_KEY = "overview-plugins";
+
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CorePluginsInjector.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CorePluginsInjector.java
index d3f836e5c61..0816cd5c5cf 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CorePluginsInjector.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CorePluginsInjector.java
@@ -70,6 +70,7 @@ class CorePluginsInjector
DROP_BOXES("drop-boxes", Constants.INPUT_THREAD_NAMES),
DATA_SOURCES("data-sources", Constants.DATA_SOURCES_KEY),
SERVICES("services", Constants.PLUGIN_SERVICES_LIST_KEY),
+ IMAGE_OVERVIEW_PLUGINS("image-overview-plugins", Constants.OVERVIEW_PLUGINS_SERVICES_LIST_KEY),
REPORTING_PLUGINS("reporting-plugins", Constants.REPORTING_PLUGIN_NAMES),
PROCESSING_PLUGINS("processing-plugins", Constants.PROCESSING_PLUGIN_NAMES),
MAINTENANCE_TASKS("maintenance-tasks", MaintenanceTaskUtils.DEFAULT_MAINTENANCE_PLUGINS_PROPERTY_NAME),
--
GitLab