summaryrefslogtreecommitdiffstats
path: root/src/com/gitblit/GitBlit.java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2011-05-04 17:35:49 -0400
committerJames Moger <james.moger@gitblit.com>2011-05-04 17:35:49 -0400
commitcf9550d8df51d927c63176675280d69b86e7a6e2 (patch)
tree9974201aae08af4e46275465eff30793e13262aa /src/com/gitblit/GitBlit.java
parentb5b4026628c50ffdfa3ceeb93badb613cdca18eb (diff)
downloadgitblit-cf9550d8df51d927c63176675280d69b86e7a6e2.tar.gz
gitblit-cf9550d8df51d927c63176675280d69b86e7a6e2.zip
Build infrastructure improvements. Setting to show remote branches.
The JGit team is now publishing 0.12.1 artifacts on the Eclipse Maven site. Yeah! That was the last missing piece for a slick Git:Blit deployment. The build has been reworked to download from Eclipse and to also download source and javadoc jars for setting up a development environment. Made the log4j pattern configurable by operating system. Moved Markdown utils to their own class since I need StringUtils for Build and that introduced a chicken-and-egg scenario.
Diffstat (limited to 'src/com/gitblit/GitBlit.java')
-rw-r--r--src/com/gitblit/GitBlit.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java
index 32ee73c4..c633f6e9 100644
--- a/src/com/gitblit/GitBlit.java
+++ b/src/com/gitblit/GitBlit.java
@@ -137,6 +137,7 @@ public class GitBlit implements ServletContextListener {
model.useTickets = config.getBoolean("gitblit", "useTickets", false);
model.useDocs = config.getBoolean("gitblit", "useDocs", false);
model.useRestrictedAccess = config.getBoolean("gitblit", "restrictedAccess", false);
+ model.showRemoteBranches = config.getBoolean("gitblit", "showRemoteBranches", false);
}
r.close();
return model;
@@ -170,6 +171,7 @@ public class GitBlit implements ServletContextListener {
config.setBoolean("gitblit", null, "useTickets", repository.useTickets);
config.setBoolean("gitblit", null, "useDocs", repository.useDocs);
config.setBoolean("gitblit", null, "restrictedAccess", repository.useRestrictedAccess);
+ config.setBoolean("gitblit", null, "showRemoteBranches", repository.showRemoteBranches);
try {
config.save();
} catch (IOException e) {
@@ -178,8 +180,8 @@ public class GitBlit implements ServletContextListener {
r.close();
}
- public void setupContext(IStoredSettings settings) {
- logger.info("Setting up GitBlit context from " + settings.toString());
+ public void configureContext(IStoredSettings settings) {
+ logger.info("Configure GitBlit from " + settings.toString());
this.storedSettings = settings;
repositoriesFolder = new File(settings.getString(Keys.git.repositoriesFolder, "repos"));
exportAll = settings.getBoolean(Keys.git.exportAll, true);
@@ -188,12 +190,9 @@ public class GitBlit implements ServletContextListener {
@Override
public void contextInitialized(ServletContextEvent contextEvent) {
- logger.info("GitBlit context initialization by servlet container...");
if (storedSettings == null) {
WebXmlSettings webxmlSettings = new WebXmlSettings(contextEvent.getServletContext());
- setupContext(webxmlSettings);
- } else {
- logger.info("GitBlit context already setup by " + storedSettings.toString());
+ configureContext(webxmlSettings);
}
}