From 0fe70c1cf434f492286e01e8528322134a10281a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 18 Jun 2011 09:39:01 -0400
Subject: [PATCH] Override settings from command-line.

---
 src/com/gitblit/GitBlit.java |  102 ++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 84 insertions(+), 18 deletions(-)

diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 0132623..1fa8b60 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -20,7 +20,10 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
@@ -42,7 +45,7 @@
 
 public class GitBlit implements ServletContextListener {
 
-	private static final GitBlit GITBLIT;
+	private static GitBlit gitblit;
 
 	private final Logger logger = LoggerFactory.getLogger(GitBlit.class);
 
@@ -50,45 +53,48 @@
 
 	private File repositoriesFolder;
 
-	private boolean exportAll;
+	private boolean exportAll = true;
 
 	private ILoginService loginService;
 
 	private IStoredSettings storedSettings;
 
-	static {
-		GITBLIT = new GitBlit();
-	}
-
-	private GitBlit() {
+	public GitBlit() {
+		if (gitblit == null) {
+			// Singleton reference when running in standard servlet container
+			gitblit = this;
+		}
 	}
 
 	public static GitBlit self() {
-		return GITBLIT;
+		if (gitblit == null) {
+			gitblit = new GitBlit();
+		}
+		return gitblit;
 	}
 
 	public static boolean getBoolean(String key, boolean defaultValue) {
-		return GITBLIT.storedSettings.getBoolean(key, defaultValue);
+		return self().storedSettings.getBoolean(key, defaultValue);
 	}
 
 	public static int getInteger(String key, int defaultValue) {
-		return GITBLIT.storedSettings.getInteger(key, defaultValue);
+		return self().storedSettings.getInteger(key, defaultValue);
 	}
 
 	public static String getString(String key, String defaultValue) {
-		return GITBLIT.storedSettings.getString(key, defaultValue);
+		return self().storedSettings.getString(key, defaultValue);
 	}
 
 	public static List<String> getStrings(String key) {
-		return GITBLIT.storedSettings.getStrings(key);
+		return self().storedSettings.getStrings(key);
 	}
 
 	public static List<String> getAllKeys(String startingWith) {
-		return GITBLIT.storedSettings.getAllKeys(startingWith);
+		return self().storedSettings.getAllKeys(startingWith);
 	}
 
-	public boolean isDebugMode() {
-		return storedSettings.getBoolean(Keys.web.debugMode, false);
+	public static boolean isDebugMode() {
+		return self().storedSettings.getBoolean(Keys.web.debugMode, false);
 	}
 
 	public List<String> getOtherCloneUrls(String repositoryName) {
@@ -100,6 +106,7 @@
 	}
 
 	public void setLoginService(ILoginService loginService) {
+		logger.info("Setting up login service " + loginService.toString());
 		this.loginService = loginService;
 	}
 
@@ -312,18 +319,77 @@
 		return false;
 	}
 
+	public String processCommitMessage(String repositoryName, String text) {
+		String html = StringUtils.breakLinesForHtml(text);
+		Map<String, String> map = new HashMap<String, String>();
+		// global regex keys
+		if (storedSettings.getBoolean(Keys.regex.global, false)) {
+			for (String key : storedSettings.getAllKeys(Keys.regex.global)) {
+				if (!key.equals(Keys.regex.global)) {
+					String subKey = key.substring(key.lastIndexOf('.') + 1);
+					map.put(subKey, storedSettings.getString(key, ""));
+				}
+			}
+		}
+
+		// repository-specific regex keys
+		List<String> keys = storedSettings.getAllKeys(Keys.regex._ROOT + "."
+				+ repositoryName.toLowerCase());
+		for (String key : keys) {
+			String subKey = key.substring(key.lastIndexOf('.') + 1);
+			map.put(subKey, storedSettings.getString(key, ""));
+		}
+
+		for (Entry<String, String> entry : map.entrySet()) {
+			String definition = entry.getValue().trim();
+			String[] chunks = definition.split("!!!");
+			if (chunks.length == 2) {
+				html = html.replaceAll(chunks[0], chunks[1]);
+			} else {
+				logger.warn(entry.getKey()
+						+ " improperly formatted.  Use !!! to separate match from replacement: "
+						+ definition);
+			}
+		}
+		return html;
+	}
+
 	public void configureContext(IStoredSettings settings) {
 		logger.info("Reading configuration from " + settings.toString());
 		this.storedSettings = settings;
-		repositoriesFolder = new File(settings.getString(Keys.git.repositoriesFolder, "repos"));
-		exportAll = settings.getBoolean(Keys.git.exportAll, true);
+		repositoriesFolder = new File(settings.getString(Keys.git.repositoriesFolder, "git"));
+		logger.info("Git repositories folder " + repositoriesFolder.getAbsolutePath());
 		repositoryResolver = new FileResolver<Void>(repositoriesFolder, exportAll);
+		String realm = settings.getString(Keys.realm.realmFile, "users.properties");
+		ILoginService loginService = null;
+		try {
+			// Check to see if this "file" is a login service class
+			Class<?> realmClass = Class.forName(realm);
+			if (ILoginService.class.isAssignableFrom(realmClass)) {
+				loginService = (ILoginService) realmClass.newInstance();
+			}
+		} catch (Throwable t) {
+			// Not a login service class OR other issue
+			// Use default file login service
+			File realmFile = new File(realm);
+			if (!realmFile.exists()) {
+				try {
+					realmFile.createNewFile();
+				} catch (IOException x) {
+					logger.error(
+							MessageFormat.format("COULD NOT CREATE REALM FILE {0}!", realmFile), x);
+				}
+			}
+			loginService = new FileLoginService(realmFile);
+		}
+		setLoginService(loginService);
 	}
 
 	@Override
 	public void contextInitialized(ServletContextEvent contextEvent) {
 		if (storedSettings == null) {
-			// for running gitblit as a traditional webapp in a servlet container
+			// for running gitblit as a traditional webapp in a servlet
+			// container
 			WebXmlSettings webxmlSettings = new WebXmlSettings(contextEvent.getServletContext());
 			configureContext(webxmlSettings);
 		}

--
Gitblit v1.9.1