From 72a7824f2f1d78e9eefde02843e95c9c5b2c4938 Mon Sep 17 00:00:00 2001
From: Vitaly Litvak <vitaliy@fundcount.com>
Date: Tue, 28 Jan 2014 09:18:04 -0500
Subject: [PATCH] Added fisheye hook script
---
src/main/java/com/gitblit/git/RepositoryResolver.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/gitblit/git/RepositoryResolver.java b/src/main/java/com/gitblit/git/RepositoryResolver.java
index 87795c0..208c1ae 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.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.gitblit.manager.IRepositoryManager;
-import com.gitblit.manager.ISessionManager;
+import com.gitblit.manager.IGitblit;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
@@ -42,17 +41,11 @@
private final Logger logger = LoggerFactory.getLogger(RepositoryResolver.class);
- private final ISessionManager sessionManager;
+ private final IGitblit gitblit;
- private final IRepositoryManager repositoryManager;
-
- public RepositoryResolver(
- ISessionManager sessionManager,
- IRepositoryManager repositoryManager) {
-
- super(repositoryManager.getRepositoriesFolder(), true);
- this.sessionManager = sessionManager;
- this.repositoryManager = repositoryManager;
+ public RepositoryResolver(IGitblit gitblit) {
+ super(gitblit.getRepositoriesFolder(), true);
+ this.gitblit = gitblit;
}
/**
@@ -83,7 +76,7 @@
*/
@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 @@
HttpServletRequest httpRequest = (HttpServletRequest) req;
scheme = httpRequest.getScheme();
origin = httpRequest.getRemoteAddr();
- user = sessionManager.authenticate(httpRequest);
+ user = gitblit.authenticate(httpRequest);
if (user == null) {
user = UserModel.ANONYMOUS;
}
--
Gitblit v1.9.1