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 | 34 +++++++---------------------------
1 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/gitblit/git/GitServlet.java b/src/main/java/com/gitblit/git/GitServlet.java
index e4719d9..cf54e6d 100644
--- a/src/main/java/com/gitblit/git/GitServlet.java
+++ b/src/main/java/com/gitblit/git/GitServlet.java
@@ -15,16 +15,11 @@
*/
package com.gitblit.git;
-import javax.inject.Inject;
-import javax.inject.Singleton;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import com.gitblit.manager.IRepositoryManager;
-import com.gitblit.manager.IRuntimeManager;
-import com.gitblit.manager.ISessionManager;
-import com.gitblit.manager.IUserManager;
+import com.gitblit.manager.IGitblit;
/**
* The GitServlet provides http/https access to Git repositories.
@@ -33,37 +28,22 @@
* @author James Moger
*
*/
-@Singleton
public class GitServlet extends org.eclipse.jgit.http.server.GitServlet {
private static final long serialVersionUID = 1L;
- private final IRuntimeManager runtimeManager;
+ private final IGitblit gitblit;
- private final IUserManager userManager;
-
- private final ISessionManager sessionManager;
-
- private final IRepositoryManager repositoryManager;
-
- @Inject
- public GitServlet(
- IRuntimeManager runtimeManager,
- IUserManager userManager,
- ISessionManager sessionManager,
- IRepositoryManager repositoryManager) {
+ public GitServlet(IGitblit gitblit) {
super();
- this.runtimeManager = runtimeManager;
- this.userManager = userManager;
- this.sessionManager = sessionManager;
- this.repositoryManager = repositoryManager;
+ this.gitblit = gitblit;
}
@Override
public void init(ServletConfig config) throws ServletException {
- setRepositoryResolver(new RepositoryResolver<HttpServletRequest>(sessionManager, repositoryManager));
- setUploadPackFactory(new GitblitUploadPackFactory<HttpServletRequest>(sessionManager));
- setReceivePackFactory(new GitblitReceivePackFactory<HttpServletRequest>(runtimeManager, userManager, repositoryManager));
+ setRepositoryResolver(new RepositoryResolver<HttpServletRequest>(gitblit));
+ setUploadPackFactory(new GitblitUploadPackFactory<HttpServletRequest>(gitblit));
+ setReceivePackFactory(new GitblitReceivePackFactory<HttpServletRequest>(gitblit));
super.init(config);
}
}
--
Gitblit v1.9.1