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 99e1e8f197e46505361905ef3c59d9691bdf4476..4c2f3dae6f5465383bde29597328d0902fd763be 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,7 +53,6 @@ public class CorePluginsInjectingPropertyPlaceholderConfigurer extends PluginType webapps = new PluginType("webapps", "webapps"); new CorePluginsInjector(ScannerType.AS, new IPluginType[] - { dssDataSources, maintenanceTasks, customImports, queryDatabases, miscellaneous }) { maintenanceTasks, customImports, queryDatabases, miscellaneous, webapps }) .injectCorePlugins(properties); } diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjectorTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjectorTest.java index c7c5527f04852b888fc33fb16c5b502ded2a780f..bd0eb746e7a6d73232f33fc4516cc3eb72861760 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjectorTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/coreplugin/CorePluginsInjectorTest.java @@ -93,9 +93,9 @@ public class CorePluginsInjectorTest extends AbstractFileSystemTestCase return "prefix."; } }; - PluginType type6 = new PluginType("webapps", "webapps"); + PluginType typeWebapps = new PluginType("webapps", "webapps"); injector = new CorePluginsInjector(ScannerType.DSS, new IPluginType[] - { type1, type2, type3, type4, type5, type6 }, logger); + { type1, type2, type3, type4, type5, type6, typeWebapps }, logger); corePluginsFolder = new File(workingDirectory, "core-plugins"); corePluginsFolder.mkdirs(); corePluginsFolderProperty =