|
|
@@ -3006,7 +3006,7 @@ public class GitBlit implements ServletContextListener { |
|
|
|
*
|
|
|
|
* @return Map<String, SettingModel>
|
|
|
|
*/
|
|
|
|
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();
|
|
|
|
}
|
|
|
|
|