From 155bf78e3377910d29b2c912f58c0f496cb428e8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 14 Apr 2011 19:44:47 -0400
Subject: [PATCH] Generate Keys class from gitblit.properties as part of build process.
---
src/com/gitblit/wicket/BasePage.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/com/gitblit/wicket/BasePage.java b/src/com/gitblit/wicket/BasePage.java
index 8084b33..9aa7baa 100644
--- a/src/com/gitblit/wicket/BasePage.java
+++ b/src/com/gitblit/wicket/BasePage.java
@@ -12,6 +12,7 @@
import org.slf4j.LoggerFactory;
import com.gitblit.Constants;
+import com.gitblit.Keys;
import com.gitblit.StoredSettings;
import com.gitblit.wicket.pages.SummaryPage;
@@ -26,7 +27,7 @@
public BasePage(PageParameters params) {
super(params);
}
-
+
protected void setupPage(String repositoryName, String pageName) {
if (repositoryName != null && repositoryName.trim().length() > 0) {
add(new Label("title", getServerName() + " - " + repositoryName));
@@ -34,38 +35,38 @@
add(new Label("title", getServerName()));
}
// header
- String siteName = StoredSettings.getString("siteName", Constants.NAME);
+ String siteName = StoredSettings.getString(Keys.web_siteName, Constants.NAME);
if (siteName == null || siteName.trim().length() == 0) {
siteName = Constants.NAME;
}
add(new Label("siteName", siteName));
add(new LinkPanel("repositoryName", null, repositoryName, SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryName)));
add(new Label("pageName", pageName));
-
+
// footer
User user = null;
- if (StoredSettings.getBoolean("authenticateWebUI", true)) {
+ if (StoredSettings.getBoolean(Keys.web_authenticate, true)) {
user = GitBlitWebSession.get().getUser();
add(new Label("userText", "Logout " + user.toString()));
} else {
add(new Label("userText", ""));
}
add(new Label("gbVersion", "v" + Constants.VERSION));
- if (StoredSettings.getBoolean("aggressiveHeapManagement", false)) {
+ if (StoredSettings.getBoolean(Keys.server_aggressiveHeapManagement, false)) {
System.gc();
}
}
-
+
protected TimeZone getTimeZone() {
- return StoredSettings.getBoolean("useClientTimezone", false) ? GitBlitWebSession.get().getTimezone() : TimeZone.getDefault();
+ return StoredSettings.getBoolean(Keys.web_useClientTimezone, false) ? GitBlitWebSession.get().getTimezone() : TimeZone.getDefault();
}
-
+
protected String getServerName() {
ServletWebRequest servletWebRequest = (ServletWebRequest) getRequest();
HttpServletRequest req = servletWebRequest.getHttpServletRequest();
return req.getServerName();
}
-
+
public void error(String message, Throwable t) {
super.error(message);
logger.error(message, t);
--
Gitblit v1.9.1