From 591c81d90f9ae27ec1b6baa264e7c46dd804655f Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 26 Nov 2010 17:16:26 +0100 Subject: [PATCH] fix broken build --- .../main/java/sonia/scm/ScmServletModule.java | 36 +++---------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java index 141d69426d..254b6f9449 100644 --- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java +++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java @@ -49,12 +49,11 @@ import sonia.scm.filter.SecurityFilter; import sonia.scm.plugin.ScriptResourceServlet; import sonia.scm.repository.RepositoryHandler; import sonia.scm.repository.RepositoryManager; +import sonia.scm.repository.xml.XmlRepositoryManager; import sonia.scm.security.EncryptionHandler; import sonia.scm.security.MessageDigestEncryptionHandler; - -import sonia.scm.user.UserHandler; import sonia.scm.user.UserManager; - +import sonia.scm.user.xml.XmlUserManager; import sonia.scm.util.DebugServlet; import sonia.scm.util.Util; import sonia.scm.web.plugin.SCMPlugin; @@ -82,8 +81,6 @@ import java.util.Map; import java.util.Set; import javax.xml.bind.JAXB; -import sonia.scm.repository.xml.XmlRepositoryManager; -import sonia.scm.user.xml.XmlUserManager; /** * @@ -166,8 +163,9 @@ public class ScmServletModule extends ServletModule bind(SecurityContext.class).to(BasicSecurityContext.class); loadPlugins(pluginManager); bind(CacheManager.class).to(EhCacheManager.class); - //bind(RepositoryManager.class).annotatedWith(Undecorated.class).to( - // BasicRepositoryManager.class); + + // bind(RepositoryManager.class).annotatedWith(Undecorated.class).to( + // BasicRepositoryManager.class); bind(RepositoryManager.class).to(XmlRepositoryManager.class); bind(UserManager.class).to(XmlUserManager.class); bind(ScmWebPluginContext.class).toInstance(webPluginContext); @@ -229,28 +227,6 @@ public class ScmServletModule extends ServletModule } } - /** - * Method description - * - * - * @param userHandlerBinder - * @param handlerSet - */ - private void bindUserHandlers(Multibinder userHandlerBinder, - Set> handlerSet) - { - for (Class handlerClass : handlerSet) - { - if (logger.isInfoEnabled()) - { - logger.info("load UserHandler {}", handlerClass.getName()); - } - - bind(handlerClass); - userHandlerBinder.addBinding().to(handlerClass); - } - } - /** * Method description * @@ -270,7 +246,6 @@ public class ScmServletModule extends ServletModule Set> repositoryHandlerSet = new LinkedHashSet>(); - // security stuff Class encryptionHandler = MessageDigestEncryptionHandler.class; @@ -286,7 +261,6 @@ public class ScmServletModule extends ServletModule repositoryHandlerSet.addAll(pluginRepositoryHandlers); } - SecurityConfig securityConfig = plugin.getSecurityConfig(); if (securityConfig != null)