From 02ee9425e07b95b0b814bc8ab4b0d077ae15e129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 14 May 2019 11:17:45 +0200 Subject: [PATCH] Do not bind repository dao in bootstrap module --- scm-webapp/src/main/java/sonia/scm/BootstrapModule.java | 8 +++----- scm-webapp/src/main/java/sonia/scm/ScmServletModule.java | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/BootstrapModule.java b/scm-webapp/src/main/java/sonia/scm/BootstrapModule.java index 81e2e70e16..c42f1e1449 100644 --- a/scm-webapp/src/main/java/sonia/scm/BootstrapModule.java +++ b/scm-webapp/src/main/java/sonia/scm/BootstrapModule.java @@ -41,9 +41,9 @@ public class BootstrapModule extends AbstractModule { protected void configure() { install(ThrowingProviderBinder.forModule(this)); - ScmConfiguration config = getScmConfiguration(); - - CipherUtil cu = CipherUtil.getInstance(); +// ScmConfiguration config = getScmConfiguration(); +// +// CipherUtil cu = CipherUtil.getInstance(); SCMContextProvider context = SCMContext.getContext(); @@ -53,8 +53,6 @@ public class BootstrapModule extends AbstractModule { bind(RepositoryLocationResolver.class).to(PathBasedRepositoryLocationResolver.class); - bind(RepositoryDAO.class, XmlRepositoryDAO.class); - bind(FileSystem.class, DefaultFileSystem.class); diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java index fb65b15236..e5908a7290 100644 --- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java +++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java @@ -266,7 +266,7 @@ public class ScmServletModule extends ServletModule // bind dao bind(GroupDAO.class, XmlGroupDAO.class); bind(UserDAO.class, XmlUserDAO.class); -// bind(RepositoryDAO.class, XmlRepositoryDAO.class); + bind(RepositoryDAO.class, XmlRepositoryDAO.class); bindDecorated(RepositoryManager.class, DefaultRepositoryManager.class, RepositoryManagerProvider.class);