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 |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.java b/src/com/gitblit/wicket/GitBlitWebApp.java
index 79083ef..5054afa 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/com/gitblit/wicket/GitBlitWebApp.java
@@ -26,6 +26,7 @@
 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;
@@ -34,6 +35,7 @@
 import com.gitblit.wicket.pages.CommitPage;
 import com.gitblit.wicket.pages.DocsPage;
 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.MarkdownPage;
@@ -89,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");
 
@@ -104,8 +111,9 @@
 		// federation urls
 		mount("/proposal", ReviewProposalPage.class, "t");
 		mount("/registration", FederationRegistrationPage.class, "u", "n");
-		
+
 		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