From 54a3db7b412003bec2e7ede8fa48cdcbb34576b1 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Thu, 28 Jun 2012 12:13:36 +0000
Subject: [PATCH] BIS-83 SP-114 : Merge changes.
SVN: 25927
---
.../CorePluginsInjectingPropertyPlaceholderConfigurer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/CorePluginsInjectingPropertyPlaceholderConfigurer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/CorePluginsInjectingPropertyPlaceholderConfigurer.java
index 4c2f3dae6f5..00d28f71937 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/CorePluginsInjectingPropertyPlaceholderConfigurer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/coreplugin/CorePluginsInjectingPropertyPlaceholderConfigurer.java
@@ -53,8 +53,8 @@ public class CorePluginsInjectingPropertyPlaceholderConfigurer extends
PluginType webapps = new PluginType("webapps", "webapps");
new CorePluginsInjector(ScannerType.AS, new IPluginType[]
- { maintenanceTasks, customImports, queryDatabases, miscellaneous, webapps })
- .injectCorePlugins(properties);
+ { maintenanceTasks, customImports, queryDatabases, miscellaneous, dssDataSources,
+ webapps }).injectCorePlugins(properties);
}
private PluginType createPluginTypeDssDataSources()
--
GitLab