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.

7 files changed, 28 insertions, 29 deletions

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>");

 	}

 }