Create a Gitblit aggregate manager delegate for git upload/receive tasks

Change-Id: I2c4a5ddf051f228c0bd949c6cd4fd44c3da81d26

1 files changed, 7 insertions, 23 deletions

diff --git a/src/main/java/com/gitblit/git/GitServlet.java b/src/main/java/com/gitblit/git/GitServlet.java
index e4719d9b..35470a29 100644
--- a/src/main/java/com/gitblit/git/GitServlet.java
+++ b/src/main/java/com/gitblit/git/GitServlet.java
@@ -21,10 +21,7 @@ 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.Gitblit;

 

 /**

  * The GitServlet provides http/https access to Git repositories.

@@ -38,32 +35,19 @@ public class GitServlet extends org.eclipse.jgit.http.server.GitServlet {
 

 	private static final long serialVersionUID = 1L;

 

-	private final IRuntimeManager runtimeManager;

-

-	private final IUserManager userManager;

-

-	private final ISessionManager sessionManager;

-

-	private final IRepositoryManager repositoryManager;

+	private final Gitblit gitblit;

 

 	@Inject

-	public GitServlet(

-			IRuntimeManager runtimeManager,

-			IUserManager userManager,

-			ISessionManager sessionManager,

-			IRepositoryManager repositoryManager) {

+	public GitServlet(Gitblit 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);

 	}

 }