added Default annotation to fix ServletContext injection on eager loading singletons

This commit is contained in:
Sebastian Sdorra
2014-08-24 14:49:35 +02:00
parent 9d1480acee
commit 50b0b6b2b8
9 changed files with 92 additions and 14 deletions

View File

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