From e299e1e9071d02ceefa2b5154f0fd1af5cbe115e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 17 Apr 2011 16:57:41 -0400
Subject: [PATCH] Finished history tree/blob links.
---
src/com/gitblit/wicket/GitBlitWebApp.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/com/gitblit/wicket/GitBlitWebApp.java b/src/com/gitblit/wicket/GitBlitWebApp.java
index 658ae67..74057c9 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/com/gitblit/wicket/GitBlitWebApp.java
@@ -11,12 +11,13 @@
import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy;
import com.gitblit.GitBlit;
-import com.gitblit.StoredSettings;
+import com.gitblit.Keys;
import com.gitblit.wicket.pages.BlobDiffPage;
import com.gitblit.wicket.pages.BlobPage;
import com.gitblit.wicket.pages.BranchesPage;
import com.gitblit.wicket.pages.CommitDiffPage;
import com.gitblit.wicket.pages.CommitPage;
+import com.gitblit.wicket.pages.HistoryPage;
import com.gitblit.wicket.pages.LogPage;
import com.gitblit.wicket.pages.PatchPage;
import com.gitblit.wicket.pages.RawPage;
@@ -24,8 +25,8 @@
import com.gitblit.wicket.pages.SummaryPage;
import com.gitblit.wicket.pages.TagPage;
import com.gitblit.wicket.pages.TagsPage;
-import com.gitblit.wicket.pages.TicGitPage;
-import com.gitblit.wicket.pages.TicGitTicketPage;
+import com.gitblit.wicket.pages.TicketsPage;
+import com.gitblit.wicket.pages.TicketPage;
import com.gitblit.wicket.pages.TreePage;
public class GitBlitWebApp extends WebApplication {
@@ -35,14 +36,15 @@
super.init();
// Setup page authorization mechanism
- if (StoredSettings.getBoolean("authenticateWebUI", false)) {
+ boolean useAuthentication = GitBlit.self().settings().getBoolean(Keys.web.authenticateViewPages, false) || GitBlit.self().settings().getBoolean(Keys.web.authenticateAdminPages, false);
+ if (useAuthentication) {
AuthorizationStrategy authStrategy = new AuthorizationStrategy();
getSecuritySettings().setAuthorizationStrategy(authStrategy);
getSecuritySettings().setUnauthorizedComponentInstantiationListener(authStrategy);
}
// Grab Browser info (like timezone, etc)
- if (StoredSettings.getBoolean("useClientTimezone", false)) {
+ if (GitBlit.self().settings().getBoolean(Keys.web.useClientTimezone, false)) {
getRequestCycleSettings().setGatherExtendedBrowserInfo(true);
}
@@ -59,12 +61,17 @@
mount(new MixedParamUrlCodingStrategy("/blobdiff", BlobDiffPage.class, new String[] { "r", "h", "f" }));
mount(new MixedParamUrlCodingStrategy("/commitdiff", CommitDiffPage.class, new String[] { "r", "h" }));
mount(new MixedParamUrlCodingStrategy("/patch", PatchPage.class, new String[] { "r", "h", "f" }));
+ mount(new MixedParamUrlCodingStrategy("/history", HistoryPage.class, new String[] { "r", "h", "f" }));
- // setup extended urls
- mount(new MixedParamUrlCodingStrategy("/ticgit", TicGitPage.class, new String[] { "r" }));
- mount(new MixedParamUrlCodingStrategy("/ticgittkt", TicGitTicketPage.class, new String[] { "r", "h", "f" }));
+ // setup ticket urls
+ mount(new MixedParamUrlCodingStrategy("/tickets", TicketsPage.class, new String[] { "r" }));
+ mount(new MixedParamUrlCodingStrategy("/ticket", TicketPage.class, new String[] { "r", "h", "f" }));
- mount(new MixedParamUrlCodingStrategy("/login", LoginPage.class, new String[] {}));
+ // setup login/logout urls, if we are using authentication
+ if (useAuthentication) {
+ mount(new MixedParamUrlCodingStrategy("/login", LoginPage.class, new String[] {}));
+ mount(new MixedParamUrlCodingStrategy("/logout", LogoutPage.class, new String[] {}));
+ }
}
@Override
@@ -87,10 +94,6 @@
if (GitBlit.self().isDebugMode())
return Application.DEVELOPMENT;
return Application.DEPLOYMENT;
- }
-
- public String getCloneUrl(String repositoryName) {
- return StoredSettings.getString("cloneUrl", "https://localhost/git/") + repositoryName;
}
public static GitBlitWebApp get() {
--
Gitblit v1.9.1