Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 00:15:44 +01:00
Code Issues Packages Projects Releases Activity

Move event bus module to bootstrap context

Browse Source
This commit is contained in:
René Pfeuffer
2019-05-20 14:26:10 +02:00
parent dad8ea5fa1
commit ca36a0a5f4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
View File

@@ -133,7 +133,6 @@ public class ScmContextListener extends GuiceResteasyBootstrapServletContextList
moduleList.add(new ResteasyModule()); moduleList.add(new ResteasyModule());
moduleList.add(new ScmInitializerModule()); moduleList.add(new ScmInitializerModule());
moduleList.add(new ScmEventBusModule());
moduleList.add(new EagerSingletonModule()); moduleList.add(new EagerSingletonModule());
moduleList.add(ShiroWebModule.guiceFilterModule()); moduleList.add(ShiroWebModule.guiceFilterModule());
moduleList.add(new WebElementModule(pluginLoader)); moduleList.add(new WebElementModule(pluginLoader));

4
scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
View File

@@ -41,6 +41,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sonia.scm.SCMContext; import sonia.scm.SCMContext;
import sonia.scm.ScmContextListener; import sonia.scm.ScmContextListener;
import sonia.scm.ScmEventBusModule;
import sonia.scm.Stage; import sonia.scm.Stage;
import sonia.scm.event.ScmEventBus; import sonia.scm.event.ScmEventBus;
import sonia.scm.plugin.DefaultPluginLoader; import sonia.scm.plugin.DefaultPluginLoader;
@@ -149,8 +150,9 @@ public class BootstrapContextListener implements ServletContextListener {
Module scmContextListenerModule = new ScmContextListenerModule(); Module scmContextListenerModule = new ScmContextListenerModule();
BootstrapModule bootstrapModule = new BootstrapModule(pluginLoader); BootstrapModule bootstrapModule = new BootstrapModule(pluginLoader);
ScmEventBusModule scmEventBusModule = new ScmEventBusModule();
Injector bootstrapInjector = Guice.createInjector(bootstrapModule, scmContextListenerModule); Injector bootstrapInjector = Guice.createInjector(bootstrapModule, scmContextListenerModule, scmEventBusModule);
processUpdates(pluginLoader, bootstrapInjector); processUpdates(pluginLoader, bootstrapInjector);