From 140e54bf102b6923ba489dddfa4ab7c03d9065bb Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Thu, 04 Sep 2014 18:07:02 -0400
Subject: [PATCH] Update lucene version to 4.10
---
src/main/java/com/gitblit/servlet/FederationServlet.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/FederationServlet.java b/src/main/java/com/gitblit/servlet/FederationServlet.java
index e86e5d6..89ff231 100644
--- a/src/main/java/com/gitblit/servlet/FederationServlet.java
+++ b/src/main/java/com/gitblit/servlet/FederationServlet.java
@@ -25,20 +25,15 @@
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
import javax.servlet.http.HttpServletResponse;
-import com.gitblit.Constants;
+import com.gitblit.Constants.FederationRequest;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
-import com.gitblit.Constants.FederationRequest;
-import com.gitblit.Keys.federation;
-import com.gitblit.Keys.git;
-import com.gitblit.Keys.groovy;
import com.gitblit.manager.IFederationManager;
import com.gitblit.manager.IRepositoryManager;
-import com.gitblit.manager.IRuntimeManager;
import com.gitblit.manager.IUserManager;
import com.gitblit.models.FederationModel;
import com.gitblit.models.FederationProposal;
@@ -61,23 +56,22 @@
private static final long serialVersionUID = 1L;
- private final IStoredSettings settings;
+ private IStoredSettings settings;
- private final IUserManager userManager;
+ private IUserManager userManager;
- private final IRepositoryManager repositoryManager;
+ private IRepositoryManager repositoryManager;
- private final IFederationManager federationManager;
+ private IFederationManager federationManager;
@Inject
public FederationServlet(
- IRuntimeManager runtimeManager,
+ IStoredSettings settings,
IUserManager userManager,
IRepositoryManager repositoryManager,
IFederationManager federationManager) {
- super();
- this.settings = runtimeManager.getSettings();
+ this.settings = settings;
this.userManager = userManager;
this.repositoryManager = repositoryManager;
this.federationManager = federationManager;
@@ -150,8 +144,11 @@
return;
}
- String url = HttpUtils.getGitblitURL(request);
- federationManager.submitFederationProposal(proposal, url);
+ String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null);
+ if (StringUtils.isEmpty(gitblitUrl)) {
+ gitblitUrl = HttpUtils.getGitblitURL(request);
+ }
+ federationManager.submitFederationProposal(proposal, gitblitUrl);
logger.info(MessageFormat.format(
"Submitted {0} federation proposal to pull {1} repositories from {2}",
proposal.tokenType.name(), proposal.repositories.size(), proposal.url));
@@ -197,7 +194,10 @@
Object result = null;
if (FederationRequest.PULL_REPOSITORIES.equals(reqType)) {
- String gitblitUrl = HttpUtils.getGitblitURL(request);
+ String gitblitUrl = settings.getString(Keys.web.canonicalUrl, null);
+ if (StringUtils.isEmpty(gitblitUrl)) {
+ gitblitUrl = HttpUtils.getGitblitURL(request);
+ }
result = federationManager.getRepositories(gitblitUrl, token);
} else {
if (FederationRequest.PULL_SETTINGS.equals(reqType)) {
--
Gitblit v1.9.1