From df162cdbdfeb5fbf5500546c9783e1685be6980f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 04 Jan 2012 08:42:54 -0500
Subject: [PATCH] Federation pull_scripts request. Documentation.
---
src/com/gitblit/wicket/panels/FederationTokensPanel.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/FederationTokensPanel.java b/src/com/gitblit/wicket/panels/FederationTokensPanel.java
index 5a2e125..3454492 100644
--- a/src/com/gitblit/wicket/panels/FederationTokensPanel.java
+++ b/src/com/gitblit/wicket/panels/FederationTokensPanel.java
@@ -28,9 +28,9 @@
import com.gitblit.Constants.FederationRequest;
import com.gitblit.Constants.FederationToken;
-import com.gitblit.FederationServlet;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.utils.FederationUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.SendProposalPage;
@@ -41,12 +41,12 @@
public FederationTokensPanel(String wicketId, final boolean showFederation) {
super(wicketId);
- final String baseUrl = getRequest().getRelativePathPrefixToContextRoot();
- add(new ExternalLink("federatedUsers", FederationServlet.asFederationLink(baseUrl, GitBlit.self()
+ final String baseUrl = WicketUtils.getGitblitURL(getRequest());
+ add(new ExternalLink("federatedUsers", FederationUtils.asLink(baseUrl, GitBlit.self()
.getFederationToken(FederationToken.USERS_AND_REPOSITORIES),
FederationRequest.PULL_USERS)));
- add(new ExternalLink("federatedSettings", FederationServlet.asFederationLink(baseUrl, GitBlit
+ add(new ExternalLink("federatedSettings", FederationUtils.asLink(baseUrl, GitBlit
.self().getFederationToken(FederationToken.ALL), FederationRequest.PULL_SETTINGS)));
final List<String[]> data = new ArrayList<String[]>();
@@ -83,7 +83,7 @@
}
item.add(new Label("value", entry[1]));
- item.add(new ExternalLink("repositoryDefinitions", FederationServlet.asFederationLink(
+ item.add(new ExternalLink("repositoryDefinitions", FederationUtils.asLink(
baseUrl, entry[1], FederationRequest.PULL_REPOSITORIES)));
item.add(new BookmarkablePageLink<Void>("send",
--
Gitblit v1.9.1