James Moger
2014-09-25 388f49ada1b32bd2e99c964a0278094e4f21c3fb
src/main/java/com/gitblit/DaggerModule.java
@@ -19,17 +19,17 @@
import com.gitblit.manager.AuthenticationManager;
import com.gitblit.manager.FederationManager;
import com.gitblit.manager.PluginManager;
import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.manager.IFederationManager;
import com.gitblit.manager.IGitblit;
import com.gitblit.manager.IPluginManager;
import com.gitblit.manager.INotificationManager;
import com.gitblit.manager.IPluginManager;
import com.gitblit.manager.IProjectManager;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.manager.IUserManager;
import com.gitblit.manager.NotificationManager;
import com.gitblit.manager.PluginManager;
import com.gitblit.manager.ProjectManager;
import com.gitblit.manager.RepositoryManager;
import com.gitblit.manager.RuntimeManager;
@@ -38,7 +38,9 @@
import com.gitblit.transport.ssh.IPublicKeyManager;
import com.gitblit.transport.ssh.MemoryKeyManager;
import com.gitblit.transport.ssh.NullKeyManager;
import com.gitblit.utils.JSoupXssFilter;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.XssFilter;
import com.gitblit.wicket.GitBlitWebApp;
import dagger.Module;
@@ -54,9 +56,11 @@
   library = true,
   injects = {
         IStoredSettings.class,
         XssFilter.class,
         // core managers
         IRuntimeManager.class,
         IPluginManager.class,
         INotificationManager.class,
         IUserManager.class,
         IAuthenticationManager.class,
@@ -64,7 +68,6 @@
         IRepositoryManager.class,
         IProjectManager.class,
         IFederationManager.class,
         IPluginManager.class,
         // the monolithic manager
         IGitblit.class,
@@ -79,20 +82,27 @@
      return new FileSettings();
   }
   @Provides @Singleton IRuntimeManager provideRuntimeManager(IStoredSettings settings) {
      return new RuntimeManager(settings);
   @Provides @Singleton XssFilter provideXssFilter() {
      return new JSoupXssFilter();
   }
   @Provides @Singleton IRuntimeManager provideRuntimeManager(IStoredSettings settings, XssFilter xssFilter) {
      return new RuntimeManager(settings, xssFilter);
   }
   @Provides @Singleton IPluginManager providePluginManager(IRuntimeManager runtimeManager) {
      return new PluginManager(runtimeManager);
   }
   @Provides @Singleton INotificationManager provideNotificationManager(IStoredSettings settings) {
      return new NotificationManager(settings);
   }
   @Provides @Singleton IUserManager provideUserManager(IRuntimeManager runtimeManager) {
      return new UserManager(runtimeManager);
   }
   @Provides @Singleton IUserManager provideUserManager(
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager) {
   @Provides @Singleton IPluginManager providePluginManager(IRuntimeManager runtimeManager) {
      return new PluginManager(runtimeManager);
      return new UserManager(runtimeManager, pluginManager);
   }
   @Provides @Singleton IAuthenticationManager provideAuthenticationManager(
@@ -131,10 +141,12 @@
   @Provides @Singleton IRepositoryManager provideRepositoryManager(
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager,
         IUserManager userManager) {
      return new RepositoryManager(
            runtimeManager,
            pluginManager,
            userManager);
   }
@@ -162,29 +174,30 @@
   @Provides @Singleton IGitblit provideGitblit(
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager,
         INotificationManager notificationManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
         IPublicKeyManager publicKeyManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager,
         IFederationManager federationManager,
         IPluginManager pluginManager) {
         IFederationManager federationManager) {
      return new GitBlit(
            runtimeManager,
            pluginManager,
            notificationManager,
            userManager,
            authenticationManager,
            publicKeyManager,
            repositoryManager,
            projectManager,
            federationManager,
            pluginManager);
            federationManager);
   }
   @Provides @Singleton GitBlitWebApp provideWebApplication(
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager,
         INotificationManager notificationManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
@@ -196,6 +209,7 @@
      return new GitBlitWebApp(
            runtimeManager,
            pluginManager,
            notificationManager,
            userManager,
            authenticationManager,