From cc47aad618137ee6481c8bc164d8074bd30fde9e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 10 Dec 2013 11:04:46 -0500
Subject: [PATCH] Remove @Inject references because they confuse JEE containers
---
src/main/java/com/gitblit/git/GitServlet.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/git/GitServlet.java b/src/main/java/com/gitblit/git/GitServlet.java
index 5a40106..cf54e6d 100644
--- a/src/main/java/com/gitblit/git/GitServlet.java
+++ b/src/main/java/com/gitblit/git/GitServlet.java
@@ -19,24 +19,31 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import com.gitblit.GitBlit;
+import com.gitblit.manager.IGitblit;
/**
* 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;
+ private final IGitblit gitblit;
+
+ public GitServlet(IGitblit gitblit) {
+ super();
+ this.gitblit = gitblit;
+ }
+
@Override
public void init(ServletConfig config) throws ServletException {
- setRepositoryResolver(new RepositoryResolver<HttpServletRequest>(GitBlit.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