From 11642275bab78a22da2f85ed06eb2246f8444f4f Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 26 Nov 2013 16:07:04 -0500 Subject: [PATCH] Instantiate and register all servlets and filters from code (servlet 3) --- src/main/java/com/gitblit/git/GitServlet.java | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/git/GitServlet.java b/src/main/java/com/gitblit/git/GitServlet.java index 5a40106..23ea343 100644 --- a/src/main/java/com/gitblit/git/GitServlet.java +++ b/src/main/java/com/gitblit/git/GitServlet.java @@ -20,21 +20,26 @@ import javax.servlet.http.HttpServletRequest; import com.gitblit.GitBlit; +import com.gitblit.manager.IRepositoryManager; /** * The GitServlet provides http/https access to Git repositories. * Access to this servlet is protected by the GitFilter. - * + * * @author James Moger - * + * */ public class GitServlet extends org.eclipse.jgit.http.server.GitServlet { private static final long serialVersionUID = 1L; + public GitServlet() { + } + @Override public void init(ServletConfig config) throws ServletException { - setRepositoryResolver(new RepositoryResolver<HttpServletRequest>(GitBlit.getRepositoriesFolder())); + IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class); + setRepositoryResolver(new RepositoryResolver<HttpServletRequest>(repositoryManager.getRepositoriesFolder())); setUploadPackFactory(new GitblitUploadPackFactory<HttpServletRequest>()); setReceivePackFactory(new GitblitReceivePackFactory<HttpServletRequest>()); super.init(config); -- Gitblit v1.9.1