From f15f17a8035717d260eb77b766c7b9c748729170 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 7 Apr 2013 00:04:59 +0200 Subject: Minor ajustments for gerrit-gitblit plugin --- src/main/java/com/gitblit/GitBlit.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java index 2c5bfe51..4e34db4a 100644 --- a/src/main/java/com/gitblit/GitBlit.java +++ b/src/main/java/com/gitblit/GitBlit.java @@ -3006,7 +3006,7 @@ public class GitBlit implements ServletContextListener { * * @return Map */ - private ServerSettings loadSettingModels() { + private ServerSettings loadSettingModels(InputStream referencePropertiesInputStream) { ServerSettings settingsModel = new ServerSettings(); settingsModel.supportsCredentialChanges = userService.supportsCredentialChanges(); settingsModel.supportsDisplayNameChanges = userService.supportsDisplayNameChanges(); @@ -3016,7 +3016,7 @@ public class GitBlit implements ServletContextListener { // Read bundled Gitblit properties to extract setting descriptions. // This copy is pristine and only used for populating the setting // models map. - InputStream is = getClass().getResourceAsStream("/reference.properties"); + InputStream is = referencePropertiesInputStream; BufferedReader propertiesReader = new BufferedReader(new InputStreamReader(is)); StringBuilder description = new StringBuilder(); SettingModel setting = new SettingModel(); @@ -3266,7 +3266,11 @@ public class GitBlit implements ServletContextListener { * @see ServletContextListener.contextInitialize(ServletContextEvent) */ @Override - public void contextInitialized(ServletContextEvent contextEvent) { + public void contextInitialized(ServletContextEvent contextEvent) { + contextInitialized(contextEvent, getClass().getResourceAsStream("/reference.properties")); + } + + public void contextInitialized(ServletContextEvent contextEvent, InputStream referencePropertiesInputStream) { servletContext = contextEvent.getServletContext(); if (settings == null) { // Gitblit is running in a servlet container @@ -3331,7 +3335,7 @@ public class GitBlit implements ServletContextListener { } } - settingsModel = loadSettingModels(); + settingsModel = loadSettingModels(referencePropertiesInputStream); serverStatus.servletContainer = servletContext.getServerInfo(); } -- cgit v1.2.3