remove unused services and fix double plugin loading

This commit is contained in:
Sebastian Sdorra
2010-10-31 13:13:58 +01:00
parent 0a9ed23b28
commit ee68f9ef60
4 changed files with 9 additions and 17 deletions

View File

@@ -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;
}