Minor ajustments for gerrit-gitblit plugin

David Ostrovsky

2013-04-06 f15f17a8035717d260eb77b766c7b9c748729170

 src/main/java/com/gitblit/GitBlit.java

@@ -3006,7 +3006,7 @@
    * 

    * @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 @@
         // 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();

@@ -3267,6 +3267,10 @@
    */

   @Override

   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 @@
         }

      }

      

      settingsModel = loadSettingModels();

      settingsModel = loadSettingModels(referencePropertiesInputStream);

      serverStatus.servletContainer = servletContext.getServerInfo();

   }