added Default annotation to fix ServletContext injection on eager loading singletons

scm-webapp/src/main/java/sonia/scm/ScmContextListener.java

@@ -204,24 +204,23 @@ public class ScmContextListener extends GuiceServletContextListener
    *
    *
    *
-   * @param servletContext
+   * @param servletCtx
    * @return
    */
-  private Injector getDefaultInjector(ServletContext servletContext)
+  private Injector getDefaultInjector(ServletContext servletCtx)
   {
     DefaultPluginLoader pluginLoader = new DefaultPluginLoader(parent, plugins);
 
     ClassOverrides overrides =
       ClassOverrides.findOverrides(pluginLoader.getUberClassLoader());
-    ScmServletModule main = new ScmServletModule(pluginLoader, overrides);
     List<Module> moduleList = Lists.newArrayList();
 
     moduleList.add(new ScmInitializerModule());
     moduleList.add(new ScmEventBusModule());
     moduleList.add(new EagerSingletonModule());
     moduleList.add(ShiroWebModule.guiceFilterModule());
-    moduleList.add(main);
-    moduleList.add(new ScmSecurityModule(servletContext));
+    moduleList.add(new ScmServletModule(servletCtx, pluginLoader, overrides));
+    moduleList.add(new ScmSecurityModule(servletCtx));
     moduleList.addAll(pluginLoader.getInjectionModules());
     moduleList.addAll(overrides.getModules());
 

scm-webapp/src/main/java/sonia/scm/ScmServletModule.java

@@ -143,6 +143,8 @@ import com.sun.jersey.spi.container.servlet.ServletContainer;
 
 import java.util.Map;
 
+import javax.servlet.ServletContext;
+
 /**
  *
  * @author Sebastian Sdorra
@@ -212,11 +214,15 @@ public class ScmServletModule extends JerseyServletModule
    * Constructs ...
    *
    *
+   *
+   * @param servletContext
    * @param pluginLoader
    * @param overrides
    */
-  ScmServletModule(DefaultPluginLoader pluginLoader, ClassOverrides overrides)
+  ScmServletModule(ServletContext servletContext,
+    DefaultPluginLoader pluginLoader, ClassOverrides overrides)
   {
+    this.servletContext = servletContext;
     this.pluginLoader = pluginLoader;
     this.overrides = overrides;
   }
@@ -244,6 +250,10 @@ public class ScmServletModule extends JerseyServletModule
       RepositoryProvider.class, Repository.class).to(
       DefaultRepositoryProvider.class).in(RequestScoped.class);
 
+    // bind servlet context
+    bind(ServletContext.class).annotatedWith(Default.class).toInstance(
+      servletContext);
+
     // bind event api
     bind(ScmEventBus.class).toInstance(ScmEventBus.getInstance());
 
@@ -500,4 +510,7 @@ public class ScmServletModule extends JerseyServletModule
 
   /** Field description */
   private final DefaultPluginLoader pluginLoader;
+
+  /** Field description */
+  private final ServletContext servletContext;
 }

scm-webapp/src/main/java/sonia/scm/resources/DefaultResourceManager.java

@@ -53,6 +53,7 @@ import java.util.Map;
 import java.util.Set;
 
 import javax.servlet.ServletContext;
+import sonia.scm.Default;
 
 /**
  *
@@ -79,7 +80,7 @@ public class DefaultResourceManager extends AbstractResourceManager
    * @param resourceHandlers
    */
   @Inject
-  public DefaultResourceManager(ServletContext servletContext,
+  public DefaultResourceManager(@Default ServletContext servletContext,
     PluginLoader pluginLoader, Set<ResourceHandler> resourceHandlers)
   {
     super(servletContext, pluginLoader, resourceHandlers);

scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java

@@ -38,6 +38,7 @@ package sonia.scm.resources;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
+import sonia.scm.Default;
 import sonia.scm.plugin.PluginLoader;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -72,7 +73,7 @@ public class DevelopmentResourceManager extends AbstractResourceManager
    * @param resourceHandlers
    */
   @Inject
-  public DevelopmentResourceManager(ServletContext servletContext,
+  public DevelopmentResourceManager(@Default ServletContext servletContext,
     PluginLoader pluginLoader, Set<ResourceHandler> resourceHandlers)
   {
     super(servletContext, pluginLoader, resourceHandlers);

scm-webapp/src/main/java/sonia/scm/template/ErrorServlet.java

@@ -86,7 +86,6 @@ public class ErrorServlet extends HttpServlet
    *
    *
    * @param context
-   * @param handler
    * @param templateEngineFactory
    */
   @Inject

scm-webapp/src/main/java/sonia/scm/template/MustacheTemplateEngine.java

@@ -46,6 +46,7 @@ import com.google.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import sonia.scm.Default;
 import sonia.scm.plugin.PluginLoader;
 
 //~--- JDK imports ------------------------------------------------------------
@@ -89,7 +90,7 @@ public class MustacheTemplateEngine implements TemplateEngine
    * @param pluginLoader
    */
   @Inject
-  public MustacheTemplateEngine(ServletContext context,
+  public MustacheTemplateEngine(@Default ServletContext context,
     PluginLoader pluginLoader)
   {
     factory = new ServletMustacheFactory(context, pluginLoader);