From ee68f9ef60750c4f4aac987d8489cc24900c2d5d Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 31 Oct 2010 13:13:58 +0100 Subject: [PATCH] remove unused services and fix double plugin loading --- .../services/sonia.scm.web.ScmWebPlugin | 1 - .../services/sonia.scm.web.ScmWebPlugin | 1 - .../main/java/sonia/scm/ContextListener.java | 3 +-- .../main/java/sonia/scm/ScmServletModule.java | 21 +++++++------------ 4 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 plugins/scm-git-plugin/src/main/resources/META-INF/services/sonia.scm.web.ScmWebPlugin delete mode 100644 plugins/scm-hg-plugin/src/main/resources/META-INF/services/sonia.scm.web.ScmWebPlugin diff --git a/plugins/scm-git-plugin/src/main/resources/META-INF/services/sonia.scm.web.ScmWebPlugin b/plugins/scm-git-plugin/src/main/resources/META-INF/services/sonia.scm.web.ScmWebPlugin deleted file mode 100644 index 9821cd8160..0000000000 --- a/plugins/scm-git-plugin/src/main/resources/META-INF/services/sonia.scm.web.ScmWebPlugin +++ /dev/null @@ -1 +0,0 @@ -sonia.scm.web.GitWebPlugin \ No newline at end of file diff --git a/plugins/scm-hg-plugin/src/main/resources/META-INF/services/sonia.scm.web.ScmWebPlugin b/plugins/scm-hg-plugin/src/main/resources/META-INF/services/sonia.scm.web.ScmWebPlugin deleted file mode 100644 index e2544ce4a0..0000000000 --- a/plugins/scm-hg-plugin/src/main/resources/META-INF/services/sonia.scm.web.ScmWebPlugin +++ /dev/null @@ -1 +0,0 @@ -sonia.scm.web.HgWebPlugin \ No newline at end of file diff --git a/scm-webapp/src/main/java/sonia/scm/ContextListener.java b/scm-webapp/src/main/java/sonia/scm/ContextListener.java index c69a0a2f70..37bb98ac3e 100644 --- a/scm-webapp/src/main/java/sonia/scm/ContextListener.java +++ b/scm-webapp/src/main/java/sonia/scm/ContextListener.java @@ -18,7 +18,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import sonia.scm.repository.RepositoryManager; -import sonia.scm.util.ServiceUtil; import sonia.scm.util.Util; import sonia.scm.web.plugin.SCMPlugin; import sonia.scm.web.plugin.SCMPluginManager; @@ -127,7 +126,7 @@ public class ContextListener extends GuiceServletContextListener { List modules = new ArrayList(); - modules.add(new ScmServletModule(webPluginContext)); + modules.add(new ScmServletModule(pluginManager, webPluginContext)); Collection pluginModules = webPluginContext.getInjectModules(); diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java index 9c3e7c2176..6f67bc3e76 100644 --- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java +++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java @@ -99,10 +99,14 @@ public class ScmServletModule extends ServletModule * Constructs ... * * + * + * @param pluginManager * @param webPluginContext */ - ScmServletModule(ScmWebPluginContext webPluginContext) + ScmServletModule(SCMPluginManager pluginManager, + ScmWebPluginContext webPluginContext) { + this.pluginManager = pluginManager; this.webPluginContext = webPluginContext; } @@ -121,18 +125,6 @@ public class ScmServletModule extends ServletModule bind(EncryptionHandler.class).to(MessageDigestEncryptionHandler.class); bind(Authenticator.class).to(XmlAuthenticator.class); bind(SecurityContext.class).to(BasicSecurityContext.class); - - SCMPluginManager pluginManager = new SCMPluginManager(); - - try - { - pluginManager.load(); - } - catch (IOException ex) - { - logger.error(ex.getMessage(), ex); - } - loadPlugins(pluginManager); bind(CacheManager.class).to(EhCacheManager.class); bind(RepositoryManager.class).annotatedWith(Undecorated.class).to( @@ -229,6 +221,9 @@ public class ScmServletModule extends ServletModule //~--- fields --------------------------------------------------------------- + /** Field description */ + private SCMPluginManager pluginManager; + /** Field description */ private ScmWebPluginContext webPluginContext; }