From c1b0e4a5a3acc31bd469cf498d1ba7d390c379b2 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 11 Dec 2013 09:08:26 -0500 Subject: [PATCH] Centralize cookie creation --- src/main/java/com/gitblit/git/GitServlet.java | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gitblit/git/GitServlet.java b/src/main/java/com/gitblit/git/GitServlet.java index 0233cd9..cf54e6d 100644 --- a/src/main/java/com/gitblit/git/GitServlet.java +++ b/src/main/java/com/gitblit/git/GitServlet.java @@ -19,8 +19,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; -import com.gitblit.GitBlit; -import com.gitblit.manager.IRepositoryManager; +import com.gitblit.manager.IGitblit; /** * The GitServlet provides http/https access to Git repositories. @@ -33,12 +32,18 @@ private static final long serialVersionUID = 1L; + private final IGitblit gitblit; + + public GitServlet(IGitblit gitblit) { + super(); + this.gitblit = gitblit; + } + @Override public void init(ServletConfig config) throws ServletException { - IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class); - setRepositoryResolver(new RepositoryResolver<HttpServletRequest>(repositoryManager.getRepositoriesFolder())); - setUploadPackFactory(new GitblitUploadPackFactory<HttpServletRequest>()); - setReceivePackFactory(new GitblitReceivePackFactory<HttpServletRequest>()); + setRepositoryResolver(new RepositoryResolver<HttpServletRequest>(gitblit)); + setUploadPackFactory(new GitblitUploadPackFactory<HttpServletRequest>(gitblit)); + setReceivePackFactory(new GitblitReceivePackFactory<HttpServletRequest>(gitblit)); super.init(config); } } -- Gitblit v1.9.1