From 23e08cdfd5f61e06f584c7fce4e765dd8b6e6643 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 managers and authentication for federation
---
src/main/java/com/gitblit/manager/ServicesManager.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/ServicesManager.java b/src/main/java/com/gitblit/manager/ServicesManager.java
index 6cc9456..8107a7d 100644
--- a/src/main/java/com/gitblit/manager/ServicesManager.java
+++ b/src/main/java/com/gitblit/manager/ServicesManager.java
@@ -32,7 +32,6 @@
import com.gitblit.Constants.AccessPermission;
import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.Constants.FederationToken;
-import com.gitblit.GitBlit;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.fanout.FanoutNioService;
@@ -62,13 +61,13 @@
private final IStoredSettings settings;
- private final GitBlit gitblit;
+ private final IGitblit gitblit;
private FanoutService fanoutService;
private GitDaemon gitDaemon;
- public ServicesManager(GitBlit gitblit) {
+ public ServicesManager(IGitblit gitblit) {
this.settings = gitblit.getSettings();
this.gitblit = gitblit;
}
@@ -209,11 +208,11 @@
private class FederationPuller extends FederationPullService {
public FederationPuller(FederationModel registration) {
- super(Arrays.asList(registration));
+ super(gitblit, Arrays.asList(registration));
}
public FederationPuller(List<FederationModel> registrations) {
- super(registrations);
+ super(gitblit, registrations);
}
@Override
--
Gitblit v1.9.1