From d8e6e97845e641fe4df0de625857a3fa2cf3deba Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 29 Mar 2015 03:26:06 +0900 Subject: [PATCH] Pass ServletContext to Plugin --- src/main/scala/gitbucket/core/plugin/Plugin.scala | 5 +++-- src/main/scala/gitbucket/core/plugin/PluginRegistory.scala | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/scala/gitbucket/core/plugin/Plugin.scala b/src/main/scala/gitbucket/core/plugin/Plugin.scala index 74c91b282..a410bff8a 100644 --- a/src/main/scala/gitbucket/core/plugin/Plugin.scala +++ b/src/main/scala/gitbucket/core/plugin/Plugin.scala @@ -1,5 +1,6 @@ package gitbucket.core.plugin +import javax.servlet.ServletContext import gitbucket.core.util.Version /** @@ -17,12 +18,12 @@ trait Plugin { * This method is invoked in initialization of plugin system. * Register plugin functionality to PluginRegistry. */ - def initialize(registry: PluginRegistry): Unit + def initialize(registry: PluginRegistry, context: ServletContext, ): Unit /** * This method is invoked in shutdown of plugin system. * If the plugin has any resources, release them in this method. */ - def shutdown(registry: PluginRegistry): Unit + def shutdown(registry: PluginRegistry, context: ServletContext, ): Unit } diff --git a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala index 93b6a266a..56490f434 100644 --- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala +++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala @@ -119,7 +119,7 @@ object PluginRegistry { } // Initialize - plugin.initialize(instance) + plugin.initialize(instance,context) instance.addPlugin(PluginInfo( pluginId = plugin.pluginId, pluginName = plugin.pluginName, @@ -140,7 +140,7 @@ object PluginRegistry { def shutdown(context: ServletContext): Unit = { instance.getPlugins().foreach { pluginInfo => try { - pluginInfo.pluginClass.shutdown(instance) + pluginInfo.pluginClass.shutdown(instance, context) } catch { case e: Exception => { logger.error(s"Error during plugin shutdown", e)