From a8204a081991049e551e1c2724b33c0da554d671 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Thu, 28 Jun 2012 12:12:04 +0000
Subject: [PATCH] BIS-83 SP-114 : Merge changes.
SVN: 25926
---
.../CorePluginsInjectingPropertyPlaceholderConfigurer.java | 1 -
.../generic/shared/coreplugin/CorePluginsInjectorTest.java | 4 ++--
2 files changed, 2 insertions(+), 3 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 99e1e8f197e..4c2f3dae6f5 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 c7c5527f048..bd0eb746e7a 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 =
--
GitLab