From 264fa5fe0c286af5a56ba47b745e8597b57afdbc Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 26 Nov 2014 20:10:36 +0100
Subject: [PATCH] load advanced plugin configuration from plugin directory and
 from root of scm home

---
 .../scm/plugin/DefaultPluginManager.java      | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
index 98479f77ec..b2250a3c21 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
@@ -102,6 +102,9 @@ public class DefaultPluginManager
   private static final String ADVANCED_CONFIGURATION =
     "advanced-configuration.xml";
 
+  /** Field description */
+  private static final String DIRECTORY_PLUGINS = "plugins";
+
   /** the logger for DefaultPluginManager */
   private static final Logger logger =
     LoggerFactory.getLogger(DefaultPluginManager.class);
@@ -153,7 +156,7 @@ public class DefaultPluginManager
       throw new ConfigurationException(ex);
     }
 
-    File file = new File(context.getBaseDirectory(), ADVANCED_CONFIGURATION);
+    File file = findAdvancedConfiguration();
 
     if (file.exists())
     {
@@ -541,6 +544,25 @@ public class DefaultPluginManager
     }
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @return
+   */
+  private File findAdvancedConfiguration()
+  {
+    File directory = new File(context.getBaseDirectory(), DIRECTORY_PLUGINS);
+    File file = new File(directory, ADVANCED_CONFIGURATION);
+
+    if (!file.exists())
+    {
+      file = new File(context.getBaseDirectory(), ADVANCED_CONFIGURATION);
+    }
+
+    return file;
+  }
+
   /**
    * Method description
    *