From 86bea9e0016b2890db8ba83049dd4e89653a0a5e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 16 Mar 2012 17:29:39 -0400
Subject: [PATCH] Ensure that the welcome message is interpreted as UTF-8 (issue 74)
---
src/com/gitblit/wicket/GitBlitWebApp.java | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/src/com/gitblit/wicket/GitBlitWebApp.java b/src/com/gitblit/wicket/GitBlitWebApp.java
index 3e7c209..5054afa 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/com/gitblit/wicket/GitBlitWebApp.java
@@ -25,6 +25,8 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.wicket.pages.ActivityPage;
+import com.gitblit.wicket.pages.BasePage;
import com.gitblit.wicket.pages.BlamePage;
import com.gitblit.wicket.pages.BlobDiffPage;
import com.gitblit.wicket.pages.BlobPage;
@@ -32,17 +34,16 @@
import com.gitblit.wicket.pages.CommitDiffPage;
import com.gitblit.wicket.pages.CommitPage;
import com.gitblit.wicket.pages.DocsPage;
-import com.gitblit.wicket.pages.FederationProposalPage;
import com.gitblit.wicket.pages.FederationRegistrationPage;
+import com.gitblit.wicket.pages.GravatarProfilePage;
import com.gitblit.wicket.pages.HistoryPage;
import com.gitblit.wicket.pages.LogPage;
-import com.gitblit.wicket.pages.LoginPage;
-import com.gitblit.wicket.pages.LogoutPage;
import com.gitblit.wicket.pages.MarkdownPage;
import com.gitblit.wicket.pages.MetricsPage;
import com.gitblit.wicket.pages.PatchPage;
import com.gitblit.wicket.pages.RawPage;
import com.gitblit.wicket.pages.RepositoriesPage;
+import com.gitblit.wicket.pages.ReviewProposalPage;
import com.gitblit.wicket.pages.SearchPage;
import com.gitblit.wicket.pages.SummaryPage;
import com.gitblit.wicket.pages.TagPage;
@@ -71,6 +72,11 @@
getRequestCycleSettings().setGatherExtendedBrowserInfo(true);
}
+ // configure the resource cache duration to 90 days for deployment
+ if (!GitBlit.isDebugMode()) {
+ getResourceSettings().setDefaultCacheDuration(90 * 86400);
+ }
+
// setup the standard gitweb-ish urls
mount("/summary", SummaryPage.class, "r");
mount("/log", LogPage.class, "r", "h");
@@ -85,7 +91,12 @@
mount("/commitdiff", CommitDiffPage.class, "r", "h");
mount("/patch", PatchPage.class, "r", "h", "f");
mount("/history", HistoryPage.class, "r", "h", "f");
- mount("/search", SearchPage.class);
+ if (GitBlit.getBoolean(Keys.lucene.enable, false)) {
+ // TODO switch this to LucenePage when it is ready
+ mount("/search", SearchPage.class);
+ } else {
+ mount("/search", SearchPage.class);
+ }
mount("/metrics", MetricsPage.class, "r");
mount("/blame", BlamePage.class, "r", "h", "f");
@@ -98,14 +109,11 @@
mount("/markdown", MarkdownPage.class, "r", "h", "f");
// federation urls
- mount("/proposal", FederationProposalPage.class, "t");
+ mount("/proposal", ReviewProposalPage.class, "t");
mount("/registration", FederationRegistrationPage.class, "u", "n");
- // setup login/logout urls, if we are using authentication
- if (useAuthentication) {
- mount("/login", LoginPage.class);
- mount("/logout", LogoutPage.class);
- }
+ mount("/activity", ActivityPage.class, "r", "h");
+ mount("/gravatar", GravatarProfilePage.class, "h");
}
private void mount(String location, Class<? extends WebPage> clazz, String... parameters) {
@@ -122,6 +130,20 @@
public Class<? extends Page> getHomePage() {
return RepositoriesPage.class;
}
+
+ /**
+ * Returns the preferred search page class.
+ *
+ * @return a Wicket class representing a search page
+ */
+ public Class<? extends BasePage> getSearchPageClass() {
+ if (GitBlit.getBoolean(Keys.lucene.enable, false)) {
+ // TODO switch this to LucenePage when it is ready
+ return SearchPage.class;//LucenePage.class;
+ }
+ return SearchPage.class;
+ }
+
@Override
public final Session newSession(Request request, Response response) {
--
Gitblit v1.9.1