Eliminate nearly all direct GitBlit singleton references in Wicket

James Moger

2013-11-16 99d0d4fd66f3490b61c700065b7d16bc4e73f226

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

@@ -3554,8 +3554,6 @@
      configureFanout();
      configureGitDaemon();
      configureCommitCache();

      ContainerUtils.CVE_2007_0450.test();
   }

   protected void configureMailExecutor() {
@@ -3774,6 +3772,10 @@
               }
            }

            // disable Git daemon on Express - we can't bind 9418 and we
            // can't port-forward to the daemon
            webxmlSettings.overrideSetting(Keys.git.daemonPort, 0);

            // configure context using the web.xml
            configureContext(webxmlSettings, base, true);
         } else {
@@ -3817,6 +3819,10 @@
            FileSettings settings = new FileSettings(localSettings.getAbsolutePath());
            configureContext(settings, base, true);
         }

         // WAR or Express is likely to be running on a Tomcat.
         // Test for the forward-slash/%2F issue and auto-adjust settings.
         ContainerUtils.CVE_2007_0450.test(settings);
      }

      settingsModel = loadSettingModels();