From 28b90d797ca57510b518deab7276b23457816caa Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Fri, 15 Feb 2013 08:41:01 +0000
Subject: [PATCH] BIS-139 / SP-511: Hot deploy .jars from a subfolder
SVN: 28380
---
.../generic/shared/utils/DssPropertyParametersUtil.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPropertyParametersUtil.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPropertyParametersUtil.java
index 07c86a0bfa2..477c3ed80cf 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPropertyParametersUtil.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/DssPropertyParametersUtil.java
@@ -109,10 +109,13 @@ public class DssPropertyParametersUtil
for (String name : pluginFolders.keySet())
{
- if (PluginContainer.tryGetInstance(name) == null)
+ File mainFolder = pluginFolders.get(name);
+ File hotDeployFolder = new File(mainFolder, "plugin");
+ if (hotDeployFolder.exists() && hotDeployFolder.isDirectory()
+ && PluginContainer.tryGetInstance(name) == null)
{
PluginContainer pluginContainer = PluginContainer.initHotDeployment(name);
- pluginContainer.addPluginDirectory(pluginFolders.get(name));
+ pluginContainer.addPluginDirectory(hotDeployFolder);
pluginContainer.refresh(true);
}
}
--
GitLab