BIS-83 SP-114 : Merge changes.

SVN: 25927

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()