From 04a98505a4ab8f48aee22800fcac193d9367d0ae Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Refactor user services and separate authentication (issue-281)
---
src/main/java/com/gitblit/manager/ServicesManager.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/ServicesManager.java b/src/main/java/com/gitblit/manager/ServicesManager.java
index 82a8a04..4cf0743 100644
--- a/src/main/java/com/gitblit/manager/ServicesManager.java
+++ b/src/main/java/com/gitblit/manager/ServicesManager.java
@@ -28,8 +28,7 @@
import org.slf4j.LoggerFactory;
import com.gitblit.Constants.FederationToken;
-import com.gitblit.FederationPullExecutor;
-import com.gitblit.Gitblit;
+import com.gitblit.GitBlit;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.fanout.FanoutNioService;
@@ -37,6 +36,7 @@
import com.gitblit.fanout.FanoutSocketService;
import com.gitblit.git.GitDaemon;
import com.gitblit.models.FederationModel;
+import com.gitblit.service.FederationPullService;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.TimeUtils;
@@ -56,13 +56,13 @@
private final IStoredSettings settings;
- private final Gitblit gitblit;
+ private final GitBlit gitblit;
private FanoutService fanoutService;
private GitDaemon gitDaemon;
- public ServicesManager(Gitblit gitblit) {
+ public ServicesManager(GitBlit gitblit) {
this.settings = gitblit.getSettings();
this.gitblit = gitblit;
}
@@ -163,7 +163,7 @@
}
}
- private class FederationPuller extends FederationPullExecutor {
+ private class FederationPuller extends FederationPullService {
public FederationPuller(FederationModel registration) {
super(Arrays.asList(registration));
--
Gitblit v1.9.1