Settings overhaul. Fixes to authentication. Bind interface feature.

Settings access has been abstracted and the way is becoming clear to
offer a WAR build in addition to the integrated server stack.  Util
methods moved around.

24 files changed, 145 insertions, 136 deletions

diff --git a/src/com/gitblit/wicket/AuthorizationStrategy.java b/src/com/gitblit/wicket/AuthorizationStrategy.java
index b73e849c..0a9d652b 100644
--- a/src/com/gitblit/wicket/AuthorizationStrategy.java
+++ b/src/com/gitblit/wicket/AuthorizationStrategy.java
@@ -15,9 +15,15 @@ public class AuthorizationStrategy extends AbstractPageAuthorizationStrategy imp
 	@SuppressWarnings({ "unchecked", "rawtypes" })

 	@Override

 	protected boolean isPageAuthorized(Class pageClass) {

-		if (BasePage.class.isAssignableFrom(pageClass))

-			return isAuthorized(pageClass);

-		// Return contruction by default

+		if (BasePage.class.isAssignableFrom(pageClass)) {

+			GitBlitWebSession session = GitBlitWebSession.get();

+			if (!session.isLoggedIn())

+				return false;

+			User user = session.getUser();

+			if (pageClass.isAnnotationPresent(AdminPage.class)) {

+				return user.canAdmin();

+			}

+		}

 		return true;

 	}

 

@@ -31,15 +37,4 @@ public class AuthorizationStrategy extends AbstractPageAuthorizationStrategy imp
 				throw new RestartResponseAtInterceptPageException(RepositoriesPage.class);

 		}

 	}

-

-	protected boolean isAuthorized(Class<? extends BasePage> pageClass) {

-		GitBlitWebSession session = GitBlitWebSession.get();

-		if (!session.isLoggedIn())

-			return false;

-		User user = session.getUser();

-		if (pageClass.isAnnotationPresent(AdminPage.class)) {

-

-		}

-		return true;

-	}

 }

diff --git a/src/com/gitblit/wicket/BasePage.html b/src/com/gitblit/wicket/BasePage.html
index 9ca9f13e..c3c56efc 100644
--- a/src/com/gitblit/wicket/BasePage.html
+++ b/src/com/gitblit/wicket/BasePage.html
@@ -32,7 +32,7 @@
 			<div style="float:right">

 				<a href="http://gitblit.com"><span wicket:id="gbVersion"></span></a> 

 			</div>

-			<div wicket:id="userText">[user text]</div>

+			<div wicket:id="userPanel">[user panel]</div>

 		</div>

 	</body>

 </html>
\ No newline at end of file
diff --git a/src/com/gitblit/wicket/BasePage.java b/src/com/gitblit/wicket/BasePage.java
index 9aa7baa0..2540ce18 100644
--- a/src/com/gitblit/wicket/BasePage.java
+++ b/src/com/gitblit/wicket/BasePage.java
@@ -12,20 +12,22 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 

 import com.gitblit.Constants;

+import com.gitblit.GitBlit;

 import com.gitblit.Keys;

-import com.gitblit.StoredSettings;

 import com.gitblit.wicket.pages.SummaryPage;

 

 public abstract class BasePage extends WebPage {

 

-	Logger logger = LoggerFactory.getLogger(BasePage.class);

+	private final Logger logger;

 

 	public BasePage() {

 		super();

+		logger = LoggerFactory.getLogger(getClass());

 	}

 

 	public BasePage(PageParameters params) {

 		super(params);

+		logger = LoggerFactory.getLogger(getClass());

 	}

 

 	protected void setupPage(String repositoryName, String pageName) {

@@ -35,7 +37,7 @@ public abstract class BasePage extends WebPage {
 			add(new Label("title", getServerName()));

 		}

 		// header

-		String siteName = StoredSettings.getString(Keys.web_siteName, Constants.NAME);

+		String siteName = GitBlit.self().settings().getString(Keys.web.siteName, Constants.NAME);

 		if (siteName == null || siteName.trim().length() == 0) {

 			siteName = Constants.NAME;

 		}

@@ -45,20 +47,20 @@ public abstract class BasePage extends WebPage {
 

 		// footer

 		User user = null;

-		if (StoredSettings.getBoolean(Keys.web_authenticate, true)) {

+		if (GitBlit.self().settings().getBoolean(Keys.web.authenticate, true)) {

 			user = GitBlitWebSession.get().getUser();

-			add(new Label("userText", "Logout " + user.toString()));

+			add(new LinkPanel("userPanel", null, getString("gb.logout") + " " + user.toString(), LogoutPage.class));

 		} else {

-			add(new Label("userText", ""));

+			add(new Label("userPanel", ""));

 		}

 		add(new Label("gbVersion", "v" + Constants.VERSION));

-		if (StoredSettings.getBoolean(Keys.server_aggressiveHeapManagement, false)) {

+		if (GitBlit.self().settings().getBoolean(Keys.web.aggressiveHeapManagement, false)) {

 			System.gc();

 		}

 	}

 

 	protected TimeZone getTimeZone() {

-		return StoredSettings.getBoolean(Keys.web_useClientTimezone, false) ? GitBlitWebSession.get().getTimezone() : TimeZone.getDefault();

+		return GitBlit.self().settings().getBoolean(Keys.web.useClientTimezone, false) ? GitBlitWebSession.get().getTimezone() : TimeZone.getDefault();

 	}

 

 	protected String getServerName() {

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.java b/src/com/gitblit/wicket/GitBlitWebApp.java
index 8589b75c..b70c95f8 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/com/gitblit/wicket/GitBlitWebApp.java
@@ -12,7 +12,6 @@ import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy;
 

 import com.gitblit.GitBlit;

 import com.gitblit.Keys;

-import com.gitblit.StoredSettings;

 import com.gitblit.wicket.pages.BlobDiffPage;

 import com.gitblit.wicket.pages.BlobPage;

 import com.gitblit.wicket.pages.BranchesPage;

@@ -36,14 +35,14 @@ public class GitBlitWebApp extends WebApplication {
 		super.init();

 

 		// Setup page authorization mechanism

-		if (StoredSettings.getBoolean(Keys.web_authenticate, false)) {

+		if (GitBlit.self().settings().getBoolean(Keys.web.authenticate, false)) {

 			AuthorizationStrategy authStrategy = new AuthorizationStrategy();

 			getSecuritySettings().setAuthorizationStrategy(authStrategy);

 			getSecuritySettings().setUnauthorizedComponentInstantiationListener(authStrategy);

 		}

 

 		// Grab Browser info (like timezone, etc)

-		if (StoredSettings.getBoolean(Keys.web_useClientTimezone, false)) {

+		if (GitBlit.self().settings().getBoolean(Keys.web.useClientTimezone, false)) {

 			getRequestCycleSettings().setGatherExtendedBrowserInfo(true);

 		}

 

@@ -61,11 +60,15 @@ public class GitBlitWebApp extends WebApplication {
 		mount(new MixedParamUrlCodingStrategy("/commitdiff", CommitDiffPage.class, new String[] { "r", "h" }));

 		mount(new MixedParamUrlCodingStrategy("/patch", PatchPage.class, new String[] { "r", "h", "f" }));

 

-		// setup extended urls

+		// setup ticgit urls

 		mount(new MixedParamUrlCodingStrategy("/ticgit", TicGitPage.class, new String[] { "r" }));

 		mount(new MixedParamUrlCodingStrategy("/ticgittkt", TicGitTicketPage.class, new String[] { "r", "h", "f" }));

 

-		mount(new MixedParamUrlCodingStrategy("/login", LoginPage.class, new String[] {}));

+		// setup login/logout urls, if we are using authentication

+		if (GitBlit.self().settings().getBoolean(Keys.web.authenticate, true)) {

+			mount(new MixedParamUrlCodingStrategy("/login", LoginPage.class, new String[] {}));

+			mount(new MixedParamUrlCodingStrategy("/logout", LogoutPage.class, new String[] {}));

+		}

 	}

 

 	@Override

@@ -90,10 +93,6 @@ public class GitBlitWebApp extends WebApplication {
 		return Application.DEPLOYMENT;

 	}

 

-	public String getCloneUrl(String repositoryName) {

-		return StoredSettings.getString(Keys.git_cloneUrl, "https://localhost/git/") + repositoryName;

-	}

-

 	public static GitBlitWebApp get() {

 		return (GitBlitWebApp) WebApplication.get();

 	}

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index 273ff5a7..10888912 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -40,4 +40,8 @@ gb.pagePrevious prev
 gb.pageNext = next

 gb.parent = parent

 gb.head = HEAD

-gb.blame = blame
\ No newline at end of file
+gb.blame = blame

+gb.login = Login

+gb.logout = Logout

+gb.username = Username

+gb.password = Password
\ No newline at end of file
diff --git a/src/com/gitblit/wicket/LinkPanel.java b/src/com/gitblit/wicket/LinkPanel.java
index ab55cfdd..91f24fac 100644
--- a/src/com/gitblit/wicket/LinkPanel.java
+++ b/src/com/gitblit/wicket/LinkPanel.java
@@ -16,6 +16,10 @@ public class LinkPanel extends Panel {
 

 	private final IModel<String> labelModel;

 

+	public LinkPanel(String wicketId, String linkCssClass, String label, Class<? extends WebPage> clazz) {

+		this(wicketId, linkCssClass, new Model<String>(label), clazz, null);

+	}

+	

 	public LinkPanel(String wicketId, String linkCssClass, String label, Class<? extends WebPage> clazz, PageParameters parameters) {

 		this(wicketId, linkCssClass, new Model<String>(label), clazz, parameters);

 	}

diff --git a/src/com/gitblit/wicket/LoginPage.html b/src/com/gitblit/wicket/LoginPage.html
index adbe64f5..7108edbe 100644
--- a/src/com/gitblit/wicket/LoginPage.html
+++ b/src/com/gitblit/wicket/LoginPage.html
@@ -17,17 +17,21 @@
 	<body onload="document.getElementById('username').focus();">

 	<div>

 		<center>

-			<img wicket:id="logo" /><br/>

+			<wicket:link>

+				<img src="resources/gitblt2.png" alt="Git:Blit"/><br/>

+			</wicket:link>

 			<span style="font-weight:bold;" wicket:id="name">[name]</span><br/>

 

 			<div>

 				<form style="text-align:center;" wicket:id="loginForm">

 					<p/>

-					Username <input type="text" id="username" wicket:id="username" value=""/>

+					<wicket:message key="gb.username"></wicket:message>

+					<input type="text" id="username" wicket:id="username" value=""/>

 					<p/>

-					Password <input type="password"  wicket:id="password" value=""/>

+					<wicket:message key="gb.password"></wicket:message>

+					<input type="password"  wicket:id="password" value=""/>

 					<p/>

-					<input type="submit" value="Login" />

+					<input type="submit" value="Login" wicket:message="value:gb.login" />

 					<div style="background-color:#c7c7c7" wicket:id="feedback"></div>

 				</form>

 			</div>

diff --git a/src/com/gitblit/wicket/LoginPage.java b/src/com/gitblit/wicket/LoginPage.java
index e3a345ce..3f8206e4 100644
--- a/src/com/gitblit/wicket/LoginPage.java
+++ b/src/com/gitblit/wicket/LoginPage.java
@@ -1,24 +1,23 @@
 package com.gitblit.wicket;

 

 import javax.servlet.http.Cookie;

-import javax.servlet.http.HttpServletRequest;

 

 import org.apache.wicket.PageParameters;

 import org.apache.wicket.markup.html.WebPage;

 import org.apache.wicket.markup.html.basic.Label;

 import org.apache.wicket.markup.html.form.Form;

 import org.apache.wicket.markup.html.form.PasswordTextField;

+import org.apache.wicket.markup.html.form.StatelessForm;

 import org.apache.wicket.markup.html.form.TextField;

-import org.apache.wicket.markup.html.image.ContextImage;

 import org.apache.wicket.markup.html.panel.FeedbackPanel;

 import org.apache.wicket.model.IModel;

 import org.apache.wicket.model.Model;

 import org.apache.wicket.protocol.http.WebRequest;

 import org.apache.wicket.protocol.http.WebResponse;

-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;

 

 import com.gitblit.Constants;

 import com.gitblit.GitBlit;

+import com.gitblit.Keys;

 

 public class LoginPage extends WebPage {

 

@@ -30,8 +29,7 @@ public class LoginPage extends WebPage {
 

 		tryAutomaticLogin();

 

-		add(new Label("title", getServerName()));

-		add(new ContextImage("logo", "gitblt2.png"));

+		add(new Label("title", GitBlit.self().settings().getString(Keys.web.siteName, Constants.NAME)));

 		add(new Label("name", Constants.NAME));

 

 		Form<Void> loginForm = new LoginForm("loginForm");

@@ -41,17 +39,20 @@ public class LoginPage extends WebPage {
 		add(loginForm);

 	}

 

-	protected String getServerName() {

-		ServletWebRequest servletWebRequest = (ServletWebRequest) getRequest();

-		HttpServletRequest req = servletWebRequest.getHttpServletRequest();

-		return req.getServerName();

-	}

-

-	class LoginForm extends Form<Void> {

+	class LoginForm extends StatelessForm<Void> {

 		private static final long serialVersionUID = 1L;

 

 		public LoginForm(String id) {

 			super(id);

+

+			// If we are already logged in because user directly accessed

+			// the login url, redirect to the home page

+			if (GitBlitWebSession.get().isLoggedIn()) {

+				setRedirect(true);

+				setResponsePage(getApplication().getHomePage());

+			}

+			

+			tryAutomaticLogin();

 		}

 

 		@Override

@@ -82,20 +83,16 @@ public class LoginPage extends WebPage {
 

 	private void loginUser(User user) {

 		if (user != null) {

-			GitBlitWebSession session = GitBlitWebSession.get();

+			// Set the user into the session

+			GitBlitWebSession.get().setUser(user);

 

 			// Set Cookie

 			WebResponse response = (WebResponse) getRequestCycle().getResponse();

 			GitBlit.self().setCookie(response, user);

 

-			// track user object so that we do not have to continue

-			// re-authenticating on each request.

-			session.setUser(user);

-

-			// Redirect to original page OR to first available tab

 			if (!continueToOriginalDestination()) {

 				// Redirect to home page

-				setResponsePage(session.getApplication().getHomePage());

+				setResponsePage(getApplication().getHomePage());

 			}

 		}

 	}

diff --git a/src/com/gitblit/wicket/LogoutPage.java b/src/com/gitblit/wicket/LogoutPage.java
new file mode 100644
index 00000000..278fbec5
--- /dev/null
+++ b/src/com/gitblit/wicket/LogoutPage.java
@@ -0,0 +1,12 @@
+package com.gitblit.wicket;

+

+import org.apache.wicket.markup.html.WebPage;

+

+public class LogoutPage extends WebPage {

+

+	public LogoutPage() {

+		getSession().invalidate();

+		setRedirect(true);

+		setResponsePage(getApplication().getHomePage());

+	}

+}
\ No newline at end of file
diff --git a/src/com/gitblit/wicket/RepositoryPage.java b/src/com/gitblit/wicket/RepositoryPage.java
index e7196690..7378543f 100644
--- a/src/com/gitblit/wicket/RepositoryPage.java
+++ b/src/com/gitblit/wicket/RepositoryPage.java
@@ -11,10 +11,13 @@ import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.protocol.http.servlet.ServletWebRequest;

 import org.eclipse.jgit.lib.Repository;

 import org.eclipse.jgit.revwalk.RevCommit;

+import org.slf4j.Logger;

+import org.slf4j.LoggerFactory;

 

 import com.gitblit.GitBlit;

-import com.gitblit.StoredSettings;

+import com.gitblit.Keys;

 import com.gitblit.utils.JGitUtils;

+import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.pages.RepositoriesPage;

 import com.gitblit.wicket.panels.PageLinksPanel;

 import com.gitblit.wicket.panels.RefsPanel;

@@ -27,6 +30,8 @@ public abstract class RepositoryPage extends BasePage {
 

 	private transient Repository r = null;

 

+	private final Logger logger = LoggerFactory.getLogger(RepositoryPage.class);

+	

 	public RepositoryPage(PageParameters params) {

 		super(params);

 		if (!params.containsKey("r")) {

@@ -69,20 +74,24 @@ public abstract class RepositoryPage extends BasePage {
 	}

 

 	protected void addFullText(String wicketId, String text, boolean substituteRegex) {

-		String html = WicketUtils.breakLines(text);

+		String html = StringUtils.breakLinesForHtml(text);

 		if (substituteRegex) {

 			Map<String, String> map = new HashMap<String, String>();

 			// global regex keys

-			for (String key : StoredSettings.getAllKeys("regex.global")) {

-				String subKey = key.substring(key.lastIndexOf('.') + 1);

-				map.put(subKey, StoredSettings.getString(key, ""));

+			if (GitBlit.self().settings().getBoolean(Keys.regex.global, false)) {

+				for (String key : GitBlit.self().settings().getAllKeys(Keys.regex.global)) {

+					if (!key.equals(Keys.regex.global)) {

+						String subKey = key.substring(key.lastIndexOf('.') + 1);

+						map.put(subKey, GitBlit.self().settings().getString(key, ""));

+					}

+				}

 			}

 

 			// repository-specific regex keys

-			List<String> keys = StoredSettings.getAllKeys("regex." + repositoryName.toLowerCase());

+			List<String> keys = GitBlit.self().settings().getAllKeys(Keys.regex._ROOT + "." + repositoryName.toLowerCase());

 			for (String key : keys) {

 				String subKey = key.substring(key.lastIndexOf('.') + 1);

-				map.put(subKey, StoredSettings.getString(key, ""));

+				map.put(subKey, GitBlit.self().settings().getString(key, ""));

 			}

 

 			for (String key : map.keySet()) {

diff --git a/src/com/gitblit/wicket/User.java b/src/com/gitblit/wicket/User.java
index e506c8cb..bd5e8c92 100644
--- a/src/com/gitblit/wicket/User.java
+++ b/src/com/gitblit/wicket/User.java
@@ -1,10 +1,14 @@
 package com.gitblit.wicket;

 

-import com.gitblit.Build;

+import java.io.Serializable;

+

 import com.gitblit.Constants;

+import com.gitblit.utils.StringUtils;

 

-public class User {

+public class User implements Serializable {

 

+	private static final long serialVersionUID = 1L;

+	

 	private String username;

 	private String cookie;

 	private boolean canAdmin = false;

@@ -13,7 +17,7 @@ public class User {
 

 	public User(String username, char[] password) {

 		this.username = username;

-		this.cookie = Build.getSHA1((Constants.NAME + username + new String(password)).getBytes());

+		this.cookie = StringUtils.getSHA1((Constants.NAME + username + new String(password)));

 	}

 

 	public void canAdmin(boolean value) {

diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index 27992f13..3288498f 100644
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/com/gitblit/wicket/WicketUtils.java
@@ -3,7 +3,6 @@ package com.gitblit.wicket;
 import java.text.DateFormat;

 import java.text.SimpleDateFormat;

 import java.util.Date;

-import java.util.List;

 import java.util.TimeZone;

 

 import org.apache.wicket.Component;

@@ -12,9 +11,9 @@ import org.apache.wicket.behavior.SimpleAttributeModifier;
 import org.apache.wicket.markup.html.basic.Label;

 import org.eclipse.jgit.lib.Constants;

 

+import com.gitblit.GitBlit;

 import com.gitblit.Keys;

-import com.gitblit.StoredSettings;

-import com.gitblit.utils.Utils;

+import com.gitblit.utils.TimeUtils;

 

 public class WicketUtils {

 

@@ -30,10 +29,6 @@ public class WicketUtils {
 		container.add(new SimpleAttributeModifier("title", value));

 	}

 

-	public static String breakLines(String string) {

-		return string.replace("\r", "<br/>").replace("\n", "<br/>");

-	}

-

 	public static void setTicketCssClass(Component container, String state) {

 		String css = null;

 		if (state.equals("open")) {

@@ -50,14 +45,6 @@ public class WicketUtils {
 		}

 	}

 

-	public static String flattenStrings(List<String> values) {

-		StringBuilder sb = new StringBuilder();

-		for (String value : values) {

-			sb.append(value).append(" ");

-		}

-		return sb.toString().trim();

-	}

-

 	public static void setAlternatingBackground(Component c, int i) {

 		String clazz = i % 2 == 0 ? "dark" : "light";

 		setCssClass(c, clazz);

@@ -69,17 +56,6 @@ public class WicketUtils {
 		return label;

 	}

 

-	public static String trimShortLog(String string) {

-		return trimString(string, 60);

-	}

-

-	public static String trimString(String value, int max) {

-		if (value.length() <= max) {

-			return value;

-		}

-		return value.substring(0, max - 3) + "...";

-	}

-

 	public static PageParameters newRepositoryParameter(String repositoryName) {

 		return new PageParameters("r=" + repositoryName);

 	}

@@ -122,30 +98,30 @@ public class WicketUtils {
 	}

 

 	public static Label createDateLabel(String wicketId, Date date, TimeZone timeZone) {

-		DateFormat df = new SimpleDateFormat(StoredSettings.getString(Keys.web_datestampShortFormat, "MM/dd/yy"));

+		DateFormat df = new SimpleDateFormat(GitBlit.self().settings().getString(Keys.web.datestampShortFormat, "MM/dd/yy"));

 		if (timeZone != null) {

 			df.setTimeZone(timeZone);

 		}

 		String dateString = df.format(date);

-		String title = Utils.timeAgo(date);

+		String title = TimeUtils.timeAgo(date);

 		if ((System.currentTimeMillis() - date.getTime()) < 10 * 24 * 60 * 60 * 1000l) {

 			String tmp = dateString;

 			dateString = title;

 			title = tmp;

 		}

 		Label label = new Label(wicketId, dateString);

-		WicketUtils.setCssClass(label, Utils.timeAgoCss(date));

+		WicketUtils.setCssClass(label, TimeUtils.timeAgoCss(date));

 		WicketUtils.setHtmlTitle(label, title);

 		return label;

 	}

 

 	public static Label createTimestampLabel(String wicketId, Date date, TimeZone timeZone) {

-		DateFormat df = new SimpleDateFormat(StoredSettings.getString(Keys.web_datetimestampLongFormat, "EEEE, MMMM d, yyyy h:mm a z"));

+		DateFormat df = new SimpleDateFormat(GitBlit.self().settings().getString(Keys.web.datetimestampLongFormat, "EEEE, MMMM d, yyyy h:mm a z"));

 		if (timeZone != null) {

 			df.setTimeZone(timeZone);

 		}

 		String dateString = df.format(date);

-		String title = Utils.timeAgo(date);

+		String title = TimeUtils.timeAgo(date);

 		Label label = new Label(wicketId, dateString);

 		WicketUtils.setHtmlTitle(label, title);

 		return label;

diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/com/gitblit/wicket/pages/BlobPage.java
index 51749a36..51eadf33 100644
--- a/src/com/gitblit/wicket/pages/BlobPage.java
+++ b/src/com/gitblit/wicket/pages/BlobPage.java
@@ -11,8 +11,8 @@ import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.Repository;

 import org.eclipse.jgit.revwalk.RevCommit;

 

+import com.gitblit.GitBlit;

 import com.gitblit.Keys;

-import com.gitblit.StoredSettings;

 import com.gitblit.utils.JGitUtils;

 import com.gitblit.wicket.LinkPanel;

 import com.gitblit.wicket.RepositoryPage;

@@ -45,13 +45,13 @@ public class BlobPage extends RepositoryPage {
 

 		// Map the extensions to types

 		Map<String, Integer> map = new HashMap<String, Integer>();

-		for (String ext : StoredSettings.getStrings(Keys.web_prettyPrintExtensions)) {

+		for (String ext : GitBlit.self().settings().getStrings(Keys.web.prettyPrintExtensions)) {

 			map.put(ext.toLowerCase(), 1);

 		}

-		for (String ext : StoredSettings.getStrings(Keys.web_imageExtensions)) {

+		for (String ext : GitBlit.self().settings().getStrings(Keys.web.imageExtensions)) {

 			map.put(ext.toLowerCase(), 2);

 		}

-		for (String ext : StoredSettings.getStrings(Keys.web_binaryExtensions)) {

+		for (String ext : GitBlit.self().settings().getStrings(Keys.web.binaryExtensions)) {

 			map.put(ext.toLowerCase(), 3);

 		}

 

diff --git a/src/com/gitblit/wicket/pages/RawPage.java b/src/com/gitblit/wicket/pages/RawPage.java
index 961e4c94..4cbf96ca 100644
--- a/src/com/gitblit/wicket/pages/RawPage.java
+++ b/src/com/gitblit/wicket/pages/RawPage.java
@@ -15,7 +15,6 @@ import org.eclipse.jgit.revwalk.RevCommit;
 

 import com.gitblit.GitBlit;

 import com.gitblit.Keys;

-import com.gitblit.StoredSettings;

 import com.gitblit.utils.JGitUtils;

 import com.gitblit.wicket.WicketUtils;

 

@@ -52,10 +51,10 @@ public class RawPage extends WebPage {
 

 		// Map the extensions to types

 		Map<String, Integer> map = new HashMap<String, Integer>();

-		for (String ext : StoredSettings.getStrings(Keys.web_imageExtensions)) {

+		for (String ext : GitBlit.self().settings().getStrings(Keys.web.imageExtensions)) {

 			map.put(ext.toLowerCase(), 2);

 		}

-		for (String ext : StoredSettings.getStrings(Keys.web_binaryExtensions)) {

+		for (String ext : GitBlit.self().settings().getStrings(Keys.web.binaryExtensions)) {

 			map.put(ext.toLowerCase(), 3);

 		}

 

diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java
index eca216c9..fd7ab52d 100644
--- a/src/com/gitblit/wicket/pages/RepositoriesPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java
@@ -19,8 +19,7 @@ import org.apache.wicket.model.Model;
 

 import com.gitblit.GitBlit;

 import com.gitblit.Keys;

-import com.gitblit.StoredSettings;

-import com.gitblit.utils.Utils;

+import com.gitblit.utils.TimeUtils;

 import com.gitblit.wicket.BasePage;

 import com.gitblit.wicket.GitBlitWebSession;

 import com.gitblit.wicket.LinkPanel;

@@ -34,11 +33,11 @@ public class RepositoriesPage extends BasePage {
 		setupPage("", "");

 

 		boolean showAdmin = false;

-		if (StoredSettings.getBoolean(Keys.web_authenticate, true)) {

-			boolean allowAdmin = StoredSettings.getBoolean(Keys.web_allowAdministration, false);

+		if (GitBlit.self().settings().getBoolean(Keys.web.authenticate, true)) {

+			boolean allowAdmin = GitBlit.self().settings().getBoolean(Keys.web.allowAdministration, false);

 			showAdmin = allowAdmin && GitBlitWebSession.get().canAdmin();

 		} else {

-			showAdmin = StoredSettings.getBoolean(Keys.web_allowAdministration, false);

+			showAdmin = GitBlit.self().settings().getBoolean(Keys.web.allowAdministration, false);

 		}

 

 		Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);

@@ -46,7 +45,7 @@ public class RepositoriesPage extends BasePage {
 		adminLinks.add(new BookmarkablePageLink<Void>("newUser", RepositoriesPage.class));

 		add(adminLinks.setVisible(showAdmin));

 

-		add(new Label("repositoriesMessage", StoredSettings.getString(Keys.web_repositoriesMessage, "")).setEscapeModelStrings(false));

+		add(new Label("repositoriesMessage", GitBlit.self().settings().getString(Keys.web.repositoriesMessage, "")).setEscapeModelStrings(false));

 

 		List<RepositoryModel> rows = GitBlit.self().getRepositories(getRequest());

 		DataProvider dp = new DataProvider(rows);

@@ -61,10 +60,10 @@ public class RepositoriesPage extends BasePage {
 				item.add(new LinkPanel("repositoryDescription", "list", entry.description, SummaryPage.class, pp));

 				item.add(new Label("repositoryOwner", entry.owner));

 

-				String lastChange = Utils.timeAgo(entry.lastChange);

+				String lastChange = TimeUtils.timeAgo(entry.lastChange);

 				Label lastChangeLabel = new Label("repositoryLastChange", lastChange);

 				item.add(lastChangeLabel);

-				WicketUtils.setCssClass(lastChangeLabel, Utils.timeAgoCss(entry.lastChange));

+				WicketUtils.setCssClass(lastChangeLabel, TimeUtils.timeAgoCss(entry.lastChange));

 

 				WicketUtils.setAlternatingBackground(item, counter);

 				counter++;

diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java
index 50de96ec..6d28df6e 100644
--- a/src/com/gitblit/wicket/pages/SummaryPage.java
+++ b/src/com/gitblit/wicket/pages/SummaryPage.java
@@ -15,10 +15,9 @@ import com.codecommit.wicket.ChartAxisType;
 import com.codecommit.wicket.ChartProvider;

 import com.codecommit.wicket.ChartType;

 import com.codecommit.wicket.IChartData;

+import com.gitblit.GitBlit;

 import com.gitblit.Keys;

-import com.gitblit.StoredSettings;

 import com.gitblit.utils.JGitUtils;

-import com.gitblit.wicket.GitBlitWebApp;

 import com.gitblit.wicket.RepositoryPage;

 import com.gitblit.wicket.WicketUtils;

 import com.gitblit.wicket.models.Metric;

@@ -34,12 +33,12 @@ public class SummaryPage extends RepositoryPage {
 		int numCommitsDef = 20;

 		int numRefsDef = 5;

 

-		int numberCommits = StoredSettings.getInteger(Keys.web_summaryCommitCount, numCommitsDef);

+		int numberCommits = GitBlit.self().settings().getInteger(Keys.web.summaryCommitCount, numCommitsDef);

 		if (numberCommits <= 0) {

 			numberCommits = numCommitsDef;

 		}

 

-		int numberRefs = StoredSettings.getInteger(Keys.web_summaryRefsCount, numRefsDef);

+		int numberRefs = GitBlit.self().settings().getInteger(Keys.web.summaryRefsCount, numRefsDef);

 		if (numberRefs <= 0) {

 			numberRefs = numRefsDef;

 		}

@@ -57,7 +56,7 @@ public class SummaryPage extends RepositoryPage {
 		add(new Label("repositoryOwner", JGitUtils.getRepositoryOwner(r)));

 

 		add(WicketUtils.createTimestampLabel("repositoryLastChange", JGitUtils.getLastChange(r), getTimeZone()));

-		add(new Label("repositoryCloneUrl", GitBlitWebApp.get().getCloneUrl(repositoryName)));

+		add(new Label("repositoryCloneUrl", GitBlit.self().getCloneUrl(repositoryName)));

 

 		add(new LogPanel("commitsPanel", repositoryName, null, r, numberCommits, 0));

 		add(new TagsPanel("tagsPanel", repositoryName, r, numberRefs));

@@ -73,7 +72,7 @@ public class SummaryPage extends RepositoryPage {
 	}

 

 	private void insertActivityGraph(List<Metric> metrics) {

-		if (StoredSettings.getBoolean(Keys.web_generateActivityGraph, true)) {

+		if (GitBlit.self().settings().getBoolean(Keys.web.generateActivityGraph, true)) {

 			IChartData data = getChartData(metrics);

 

 			ChartProvider provider = new ChartProvider(new Dimension(400, 80), ChartType.LINE, data);

diff --git a/src/com/gitblit/wicket/pages/TicGitPage.java b/src/com/gitblit/wicket/pages/TicGitPage.java
index 204565c6..a03ee607 100644
--- a/src/com/gitblit/wicket/pages/TicGitPage.java
+++ b/src/com/gitblit/wicket/pages/TicGitPage.java
@@ -9,6 +9,7 @@ import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.markup.repeater.data.ListDataProvider;

 

 import com.gitblit.utils.JGitUtils;

+import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.GitBlitWebSession;

 import com.gitblit.wicket.LinkPanel;

 import com.gitblit.wicket.RepositoryPage;

@@ -36,8 +37,8 @@ public class TicGitPage extends RepositoryPage {
 				WicketUtils.setTicketCssClass(stateLabel, entry.state);

 				item.add(stateLabel);

 				item.add(WicketUtils.createDateLabel("ticketDate", entry.date, GitBlitWebSession.get().getTimezone()));

-				item.add(new Label("ticketHandler", WicketUtils.trimString(entry.handler.toLowerCase(), 30)));

-				item.add(new LinkPanel("ticketTitle", "list subject", WicketUtils.trimString(entry.title, 80), TicGitTicketPage.class, newPathParameter(entry.name)));

+				item.add(new Label("ticketHandler", StringUtils.trimString(entry.handler.toLowerCase(), 30)));

+				item.add(new LinkPanel("ticketTitle", "list subject", StringUtils.trimString(entry.title, 80), TicGitTicketPage.class, newPathParameter(entry.name)));

 

 				WicketUtils.setAlternatingBackground(item, counter);

 				counter++;

diff --git a/src/com/gitblit/wicket/pages/TicGitTicketPage.html b/src/com/gitblit/wicket/pages/TicGitTicketPage.html
index aafbf8c0..56e29804 100644
--- a/src/com/gitblit/wicket/pages/TicGitTicketPage.html
+++ b/src/com/gitblit/wicket/pages/TicGitTicketPage.html
@@ -29,8 +29,9 @@
 	<table style="width:100%;" class="comments">

 		<tbody>

 			<tr valign="top" wicket:id="comment">

-         		<td><span class="date" wicket:id="commentDate">[comment date]</span><br/>

-         		<span class="author" wicket:id="commentAuthor">[comment author]</span></td>

+         		<td><span class="author" wicket:id="commentAuthor">[comment author]</span><br/>

+         			<span class="date" wicket:id="commentDate">[comment date]</span>

+         		</td>

          		<td><span wicket:id="commentText">[comment text]</span></td>

        		</tr>

        	</tbody>

diff --git a/src/com/gitblit/wicket/pages/TicGitTicketPage.java b/src/com/gitblit/wicket/pages/TicGitTicketPage.java
index 30bd6ccf..b4c9cf55 100644
--- a/src/com/gitblit/wicket/pages/TicGitTicketPage.java
+++ b/src/com/gitblit/wicket/pages/TicGitTicketPage.java
@@ -8,7 +8,7 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider;
 import org.eclipse.jgit.lib.Repository;

 

 import com.gitblit.utils.JGitUtils;

-import com.gitblit.utils.Utils;

+import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.GitBlitWebSession;

 import com.gitblit.wicket.RepositoryPage;

 import com.gitblit.wicket.WicketUtils;

@@ -32,7 +32,7 @@ public class TicGitTicketPage extends RepositoryPage {
 		Label stateLabel = new Label("ticketState", t.state);

 		WicketUtils.setTicketCssClass(stateLabel, t.state);

 		add(stateLabel);

-		add(new Label("ticketTags", WicketUtils.flattenStrings(t.tags)));

+		add(new Label("ticketTags", StringUtils.flattenStrings(t.tags)));

 

 		ListDataProvider<Comment> commentsDp = new ListDataProvider<Comment>(t.comments);

 		DataView<Comment> commentsView = new DataView<Comment>("comment", commentsDp) {

@@ -57,8 +57,8 @@ public class TicGitTicketPage extends RepositoryPage {
 	}

 

 	private String prepareComment(String comment) {

-		String html = Utils.escapeForHtml(comment, false);

-		html = WicketUtils.breakLines(comment).trim();

+		String html = StringUtils.escapeForHtml(comment, false);

+		html = StringUtils.breakLinesForHtml(comment).trim();

 		return html.replaceAll("\\bcommit\\s*([A-Za-z0-9]*)\\b", "<a href=\"/commit/" + repositoryName + "/$1\">commit $1</a>");

 	}

 }

diff --git a/src/com/gitblit/wicket/panels/BasePanel.java b/src/com/gitblit/wicket/panels/BasePanel.java
index cdfc050c..6ddc0a07 100644
--- a/src/com/gitblit/wicket/panels/BasePanel.java
+++ b/src/com/gitblit/wicket/panels/BasePanel.java
@@ -4,8 +4,8 @@ import java.util.TimeZone;
 

 import org.apache.wicket.markup.html.panel.Panel;

 

+import com.gitblit.GitBlit;

 import com.gitblit.Keys;

-import com.gitblit.StoredSettings;

 import com.gitblit.wicket.GitBlitWebSession;

 

 public abstract class BasePanel extends Panel {

@@ -17,6 +17,6 @@ public abstract class BasePanel extends Panel {
 	}

 

 	protected TimeZone getTimeZone() {

-		return StoredSettings.getBoolean(Keys.web_useClientTimezone, false) ? GitBlitWebSession.get().getTimezone() : TimeZone.getDefault();

+		return GitBlit.self().settings().getBoolean(Keys.web.useClientTimezone, false) ? GitBlitWebSession.get().getTimezone() : TimeZone.getDefault();

 	}

 }

diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.java b/src/com/gitblit/wicket/panels/BranchesPanel.java
index 8ac78e4c..ff4679f5 100644
--- a/src/com/gitblit/wicket/panels/BranchesPanel.java
+++ b/src/com/gitblit/wicket/panels/BranchesPanel.java
@@ -14,6 +14,7 @@ import org.eclipse.jgit.lib.Constants;
 import org.eclipse.jgit.lib.Repository;

 

 import com.gitblit.utils.JGitUtils;

+import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.LinkPanel;

 import com.gitblit.wicket.WicketUtils;

 import com.gitblit.wicket.models.RefModel;

@@ -59,7 +60,7 @@ public class BranchesPanel extends BasePanel {
 

 				item.add(WicketUtils.createDateLabel("branchDate", entry.getDate(), getTimeZone()));

 

-				item.add(new LinkPanel("branchName", "list name", WicketUtils.trimString(entry.getDisplayName(), 28), LogPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

+				item.add(new LinkPanel("branchName", "list name", StringUtils.trimString(entry.getDisplayName(), 28), LogPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName())));

 

 				// only show branch type on the branches page

 				boolean remote = entry.getName().startsWith(Constants.R_REMOTES);

diff --git a/src/com/gitblit/wicket/panels/LogPanel.java b/src/com/gitblit/wicket/panels/LogPanel.java
index 504bdd3a..20754108 100644
--- a/src/com/gitblit/wicket/panels/LogPanel.java
+++ b/src/com/gitblit/wicket/panels/LogPanel.java
@@ -14,9 +14,10 @@ import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Repository;

 import org.eclipse.jgit.revwalk.RevCommit;

 

+import com.gitblit.GitBlit;

 import com.gitblit.Keys;

-import com.gitblit.StoredSettings;

 import com.gitblit.utils.JGitUtils;

+import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.LinkPanel;

 import com.gitblit.wicket.WicketUtils;

 import com.gitblit.wicket.pages.CommitDiffPage;

@@ -32,7 +33,7 @@ public class LogPanel extends BasePanel {
 	public LogPanel(String wicketId, final String repositoryName, String objectId, Repository r, int limit, int pageOffset) {

 		super(wicketId);

 		boolean pageResults = limit <= 0;

-		int itemsPerPage = StoredSettings.getInteger(Keys.web_logPageCommitCount, 50);

+		int itemsPerPage = GitBlit.self().settings().getInteger(Keys.web.logPageCommitCount, 50);

 		if (itemsPerPage <= 1) {

 			itemsPerPage = 50;

 		}

@@ -73,7 +74,7 @@ public class LogPanel extends BasePanel {
 				item.add(WicketUtils.createAuthorLabel("commitAuthor", author));

 

 				String shortMessage = entry.getShortMessage();

-				String trimmedMessage = WicketUtils.trimShortLog(shortMessage);

+				String trimmedMessage = StringUtils.trimShortLog(shortMessage);

 				LinkPanel shortlog = new LinkPanel("commitShortMessage", "list subject", trimmedMessage, CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getName()));

 				if (!shortMessage.equals(trimmedMessage)) {

 					WicketUtils.setHtmlTitle(shortlog, shortMessage);

diff --git a/src/com/gitblit/wicket/panels/PageLinksPanel.java b/src/com/gitblit/wicket/panels/PageLinksPanel.java
index 252b49a4..18cfad62 100644
--- a/src/com/gitblit/wicket/panels/PageLinksPanel.java
+++ b/src/com/gitblit/wicket/panels/PageLinksPanel.java
@@ -15,7 +15,8 @@ import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.markup.repeater.data.ListDataProvider;

 import org.eclipse.jgit.lib.Repository;

 

-import com.gitblit.StoredSettings;

+import com.gitblit.GitBlit;

+import com.gitblit.Keys;

 import com.gitblit.utils.JGitUtils;

 import com.gitblit.wicket.LinkPanel;

 import com.gitblit.wicket.WicketUtils;

@@ -55,8 +56,8 @@ public class PageLinksPanel extends Panel {
 		add(new BookmarkablePageLink<Void>("tree", TreePage.class, WicketUtils.newRepositoryParameter(repositoryName)));

 

 		// Get the repository ticgit setting

-		boolean checkTicgit = StoredSettings.getBoolean("ticgit.global", false);

-		checkTicgit |= StoredSettings.getBoolean(MessageFormat.format("ticgit.{0}", repositoryName), false);

+		boolean checkTicgit = GitBlit.self().settings().getBoolean(Keys.ticgit.global, false);

+		checkTicgit |= GitBlit.self().settings().getBoolean(MessageFormat.format(Keys.ticgit._ROOT + ".{0}", repositoryName), false);

 

 		// Add dynamic repository extras

 		List<String> extras = new ArrayList<String>();

diff --git a/src/com/gitblit/wicket/panels/TagsPanel.java b/src/com/gitblit/wicket/panels/TagsPanel.java
index 3d8364cd..979a2752 100644
--- a/src/com/gitblit/wicket/panels/TagsPanel.java
+++ b/src/com/gitblit/wicket/panels/TagsPanel.java
@@ -11,6 +11,7 @@ import org.apache.wicket.model.StringResourceModel;
 import org.eclipse.jgit.lib.Repository;

 

 import com.gitblit.utils.JGitUtils;

+import com.gitblit.utils.StringUtils;

 import com.gitblit.wicket.LinkPanel;

 import com.gitblit.wicket.WicketUtils;

 import com.gitblit.wicket.models.RefModel;

@@ -52,7 +53,7 @@ public class TagsPanel extends BasePanel {
 				item.add(new LinkPanel("tagName", "list name", entry.getDisplayName(), CommitPage.class, WicketUtils.newObjectParameter(repositoryName, entry.getCommitId().getName())));

 				String message;

 				if (maxCount > 0) {

-					message = WicketUtils.trimString(entry.getShortLog(), 40);

+					message = StringUtils.trimString(entry.getShortLog(), 40);

 				} else {

 					message = entry.getShortLog();

 				}