diff options
Diffstat (limited to 'src/main/java/com/gitblit/git')
| -rw-r--r-- | src/main/java/com/gitblit/git/GitDaemon.java | 19 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/git/GitServlet.java | 30 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/git/GitblitReceivePack.java | 23 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/git/GitblitReceivePackFactory.java | 29 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/git/RepositoryResolver.java | 21 |
5 files changed, 38 insertions, 84 deletions
diff --git a/src/main/java/com/gitblit/git/GitDaemon.java b/src/main/java/com/gitblit/git/GitDaemon.java index 40cbe704..a7e7cd55 100644 --- a/src/main/java/com/gitblit/git/GitDaemon.java +++ b/src/main/java/com/gitblit/git/GitDaemon.java @@ -67,12 +67,9 @@ import org.eclipse.jgit.transport.resolver.UploadPackFactory; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.gitblit.Gitblit;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
-import com.gitblit.manager.IRepositoryManager;
-import com.gitblit.manager.IRuntimeManager;
-import com.gitblit.manager.ISessionManager;
-import com.gitblit.manager.IUserManager;
import com.gitblit.utils.StringUtils;
/**
@@ -111,13 +108,9 @@ public class GitDaemon { private ReceivePackFactory<GitDaemonClient> receivePackFactory;
- public GitDaemon(
- IRuntimeManager runtimeManager,
- IUserManager userManager,
- ISessionManager sessionManager,
- IRepositoryManager repositoryManager) {
+ public GitDaemon(Gitblit gitblit) {
- IStoredSettings settings = runtimeManager.getSettings();
+ IStoredSettings settings = gitblit.getSettings();
int port = settings.getInteger(Keys.git.daemonPort, 0);
String bindInterface = settings.getString(Keys.git.daemonBindInterface, "localhost");
@@ -127,9 +120,9 @@ public class GitDaemon { myAddress = new InetSocketAddress(bindInterface, port);
}
- repositoryResolver = new RepositoryResolver<GitDaemonClient>(sessionManager, repositoryManager);
- uploadPackFactory = new GitblitUploadPackFactory<GitDaemonClient>(sessionManager);
- receivePackFactory = new GitblitReceivePackFactory<GitDaemonClient>(runtimeManager, userManager, repositoryManager);
+ repositoryResolver = new RepositoryResolver<GitDaemonClient>(gitblit);
+ uploadPackFactory = new GitblitUploadPackFactory<GitDaemonClient>(gitblit);
+ receivePackFactory = new GitblitReceivePackFactory<GitDaemonClient>(gitblit);
run = new AtomicBoolean(false);
processors = new ThreadGroup("Git-Daemon");
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);
}
}
diff --git a/src/main/java/com/gitblit/git/GitblitReceivePack.java b/src/main/java/com/gitblit/git/GitblitReceivePack.java index 44e2bef5..cc1490e6 100644 --- a/src/main/java/com/gitblit/git/GitblitReceivePack.java +++ b/src/main/java/com/gitblit/git/GitblitReceivePack.java @@ -44,12 +44,10 @@ import org.slf4j.LoggerFactory; import com.gitblit.Constants;
import com.gitblit.Constants.AccessRestrictionType;
-import com.gitblit.GitBlit;
+import com.gitblit.Gitblit;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.client.Translation;
-import com.gitblit.manager.IRepositoryManager;
-import com.gitblit.manager.IRuntimeManager;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.ArrayUtils;
@@ -93,24 +91,23 @@ public class GitblitReceivePack extends ReceivePack implements PreReceiveHook, P private final IStoredSettings settings;
- private final IRepositoryManager repositoryManager;
+ private final Gitblit gitblit;
public GitblitReceivePack(
- IRuntimeManager runtimeManager,
- IRepositoryManager repositoryManager,
+ Gitblit gitblit,
Repository db,
RepositoryModel repository,
UserModel user) {
super(db);
- this.settings = runtimeManager.getSettings();
- this.repositoryManager = repositoryManager;
+ this.settings = gitblit.getSettings();
+ this.gitblit = gitblit;
this.repository = repository;
this.user = user == null ? UserModel.ANONYMOUS : user;
- this.groovyDir = repositoryManager.getHooksFolder();
+ this.groovyDir = gitblit.getHooksFolder();
try {
// set Grape root
- File grapeRoot = repositoryManager.getGrapesFolder();
+ File grapeRoot = gitblit.getGrapesFolder();
grapeRoot.mkdirs();
System.setProperty("grape.root", grapeRoot.getAbsolutePath());
this.gse = new GroovyScriptEngine(groovyDir.getAbsolutePath());
@@ -249,7 +246,7 @@ public class GitblitReceivePack extends ReceivePack implements PreReceiveHook, P }
Set<String> scripts = new LinkedHashSet<String>();
- scripts.addAll(repositoryManager.getPreReceiveScriptsInherited(repository));
+ scripts.addAll(gitblit.getPreReceiveScriptsInherited(repository));
if (!ArrayUtils.isEmpty(repository.preReceiveScripts)) {
scripts.addAll(repository.preReceiveScripts);
}
@@ -344,7 +341,7 @@ public class GitblitReceivePack extends ReceivePack implements PreReceiveHook, P // run Groovy hook scripts
Set<String> scripts = new LinkedHashSet<String>();
- scripts.addAll(repositoryManager.getPostReceiveScriptsInherited(repository));
+ scripts.addAll(gitblit.getPostReceiveScriptsInherited(repository));
if (!ArrayUtils.isEmpty(repository.postReceiveScripts)) {
scripts.addAll(repository.postReceiveScripts);
}
@@ -459,7 +456,7 @@ public class GitblitReceivePack extends ReceivePack implements PreReceiveHook, P }
Binding binding = new Binding();
- binding.setVariable("gitblit", GitBlit.self());
+ binding.setVariable("gitblit", gitblit);
binding.setVariable("repository", repository);
binding.setVariable("receivePack", this);
binding.setVariable("user", user);
diff --git a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java index 2cdb9856..71a8e68b 100644 --- a/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java +++ b/src/main/java/com/gitblit/git/GitblitReceivePackFactory.java @@ -26,11 +26,9 @@ import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.gitblit.Gitblit; import com.gitblit.IStoredSettings; import com.gitblit.Keys; -import com.gitblit.manager.IRepositoryManager; -import com.gitblit.manager.IRuntimeManager; -import com.gitblit.manager.IUserManager; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; import com.gitblit.utils.HttpUtils; @@ -49,23 +47,12 @@ public class GitblitReceivePackFactory<X> implements ReceivePackFactory<X> { private final IStoredSettings settings; - private final IRuntimeManager runtimeManager; - - private final IUserManager userManager; - - private final IRepositoryManager repositoryManager; - - public GitblitReceivePackFactory( - IRuntimeManager runtimeManager, - IUserManager userManager, - IRepositoryManager repositoryManager) { + private final Gitblit gitblit; + public GitblitReceivePackFactory(Gitblit gitblit) { super(); - this.settings = runtimeManager.getSettings(); - this.runtimeManager = runtimeManager; - this.userManager = userManager; - this.repositoryManager = repositoryManager; - + this.settings = gitblit.getSettings(); + this.gitblit = gitblit; } @Override @@ -90,7 +77,7 @@ public class GitblitReceivePackFactory<X> implements ReceivePackFactory<X> { // determine pushing user String username = request.getRemoteUser(); if (!StringUtils.isEmpty(username)) { - UserModel u = userManager.getUserModel(username); + UserModel u = gitblit.getUserModel(username); if (u != null) { user = u; } @@ -111,9 +98,9 @@ public class GitblitReceivePackFactory<X> implements ReceivePackFactory<X> { throw new ServiceNotEnabledException(); } - final RepositoryModel repository = repositoryManager.getRepositoryModel(repositoryName); + final RepositoryModel repository = gitblit.getRepositoryModel(repositoryName); - final GitblitReceivePack rp = new GitblitReceivePack(runtimeManager, repositoryManager, db, repository, user); + final GitblitReceivePack rp = new GitblitReceivePack(gitblit, db, repository, user); rp.setGitblitUrl(gitblitUrl); rp.setRepositoryUrl(repositoryUrl); rp.setRefLogIdent(new PersonIdent(user.username, user.username + "@" + origin)); diff --git a/src/main/java/com/gitblit/git/RepositoryResolver.java b/src/main/java/com/gitblit/git/RepositoryResolver.java index 87795c07..39d1f396 100644 --- a/src/main/java/com/gitblit/git/RepositoryResolver.java +++ b/src/main/java/com/gitblit/git/RepositoryResolver.java @@ -27,8 +27,7 @@ import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.gitblit.manager.IRepositoryManager; -import com.gitblit.manager.ISessionManager; +import com.gitblit.Gitblit; import com.gitblit.models.RepositoryModel; import com.gitblit.models.UserModel; @@ -42,17 +41,11 @@ public class RepositoryResolver<X> extends FileResolver<X> { private final Logger logger = LoggerFactory.getLogger(RepositoryResolver.class); - private final ISessionManager sessionManager; + private final Gitblit gitblit; - private final IRepositoryManager repositoryManager; - - public RepositoryResolver( - ISessionManager sessionManager, - IRepositoryManager repositoryManager) { - - super(repositoryManager.getRepositoriesFolder(), true); - this.sessionManager = sessionManager; - this.repositoryManager = repositoryManager; + public RepositoryResolver(Gitblit gitblit) { + super(gitblit.getRepositoriesFolder(), true); + this.gitblit = gitblit; } /** @@ -83,7 +76,7 @@ public class RepositoryResolver<X> extends FileResolver<X> { */ @Override protected boolean isExportOk(X req, String repositoryName, Repository db) throws IOException { - RepositoryModel model = repositoryManager.getRepositoryModel(repositoryName); + RepositoryModel model = gitblit.getRepositoryModel(repositoryName); String scheme = null; UserModel user = null; @@ -101,7 +94,7 @@ public class RepositoryResolver<X> extends FileResolver<X> { HttpServletRequest httpRequest = (HttpServletRequest) req; scheme = httpRequest.getScheme(); origin = httpRequest.getRemoteAddr(); - user = sessionManager.authenticate(httpRequest); + user = gitblit.authenticate(httpRequest); if (user == null) { user = UserModel.ANONYMOUS; } |