Return of Servlet3 servlet and filter loading

James Moger

2014-05-16 17e2d3407065a7433c7512c37a7cf7e7df63f337

 src/main/java/com/gitblit/DaggerModule.java

@@ -19,27 +19,48 @@

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;
import com.gitblit.manager.UserManager;
import com.gitblit.servlet.BranchGraphServlet;
import com.gitblit.servlet.DownloadZipFilter;
import com.gitblit.servlet.DownloadZipServlet;
import com.gitblit.servlet.EnforceAuthenticationFilter;
import com.gitblit.servlet.FederationServlet;
import com.gitblit.servlet.GitFilter;
import com.gitblit.servlet.GitServlet;
import com.gitblit.servlet.LogoServlet;
import com.gitblit.servlet.PagesFilter;
import com.gitblit.servlet.PagesServlet;
import com.gitblit.servlet.ProxyFilter;
import com.gitblit.servlet.PtServlet;
import com.gitblit.servlet.RawFilter;
import com.gitblit.servlet.RawServlet;
import com.gitblit.servlet.RobotsTxtServlet;
import com.gitblit.servlet.RpcFilter;
import com.gitblit.servlet.RpcServlet;
import com.gitblit.servlet.SparkleShareInviteServlet;
import com.gitblit.servlet.SyndicationFilter;
import com.gitblit.servlet.SyndicationServlet;
import com.gitblit.transport.ssh.FileKeyManager;
import com.gitblit.transport.ssh.IPublicKeyManager;
import com.gitblit.transport.ssh.MemoryKeyManager;
import com.gitblit.transport.ssh.NullKeyManager;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.GitBlitWebApp;
import com.gitblit.wicket.GitblitWicketFilter;

import dagger.Module;
import dagger.Provides;
@@ -57,6 +78,7 @@

         // core managers
         IRuntimeManager.class,
         IPluginManager.class,
         INotificationManager.class,
         IUserManager.class,
         IAuthenticationManager.class,
@@ -64,13 +86,35 @@
         IRepositoryManager.class,
         IProjectManager.class,
         IFederationManager.class,
         IPluginManager.class,

         // the monolithic manager
         IGitblit.class,

         // the Gitblit Wicket app
         GitBlitWebApp.class
         GitBlitWebApp.class,

         // filters & servlets
         GitServlet.class,
         GitFilter.class,
         RawServlet.class,
         RawFilter.class,
         PagesServlet.class,
         PagesFilter.class,
         RpcServlet.class,
         RpcFilter.class,
         DownloadZipServlet.class,
         DownloadZipFilter.class,
         SyndicationServlet.class,
         SyndicationFilter.class,
         FederationServlet.class,
         SparkleShareInviteServlet.class,
         BranchGraphServlet.class,
         RobotsTxtServlet.class,
         LogoServlet.class,
         PtServlet.class,
         ProxyFilter.class,
         EnforceAuthenticationFilter.class,
         GitblitWicketFilter.class
      }
)
public class DaggerModule {
@@ -83,16 +127,19 @@
      return new RuntimeManager(settings);
   }

   @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 +178,12 @@

   @Provides @Singleton IRepositoryManager provideRepositoryManager(
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager,
         IUserManager userManager) {

      return new RepositoryManager(
            runtimeManager,
            pluginManager,
            userManager);
   }

@@ -162,29 +211,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 +246,7 @@

      return new GitBlitWebApp(
            runtimeManager,
            pluginManager,
            notificationManager,
            userManager,
            authenticationManager,
@@ -205,4 +256,289 @@
            federationManager,
            gitblit);
   }
//
//   @Provides @Singleton GitblitWicketFilter provideGitblitWicketFilter(GitBlitWebApp webapp) {
//      return new GitblitWicketFilter(webapp);
//   }
//
//   @Provides GitServlet provideGitServlet(IGitblit gitblit) {
//      return new GitServlet(gitblit);
//   }
//
//   @Provides GitFilter provideGitFilter(
//         IRuntimeManager runtimeManager,
//         IUserManager userManager,
//         IAuthenticationManager authenticationManager,
//         IRepositoryManager repositoryManager,
//         IFederationManager federationManager) {
//
//      return new GitFilter(
//            runtimeManager,
//            userManager,
//            authenticationManager,
//            repositoryManager,
//            federationManager);
//   }
//
//   @Provides @Singleton PagesServlet providePagesServlet(
//         IRuntimeManager runtimeManager,
//         IRepositoryManager repositoryManager) {
//
//      return new PagesServlet(runtimeManager, repositoryManager);
//   }
//
//   @Provides @Singleton PagesFilter providePagesFilter(
//         IRuntimeManager runtimeManager,
//         IAuthenticationManager authenticationManager,
//         IRepositoryManager repositoryManager) {
//
//      return new PagesFilter(
//            runtimeManager,
//            authenticationManager,
//            repositoryManager);
//   }
//
//   @Provides @Singleton RpcServlet provideRpcServlet(IGitblit gitblit) {
//      return new RpcServlet(gitblit);
//   }
//
//   @Provides @Singleton RpcFilter provideRpcFilter(
//         IRuntimeManager runtimeManager,
//         IAuthenticationManager authenticationManager) {
//
//      return new RpcFilter(runtimeManager, authenticationManager);
//   }
//
//   @Provides @Singleton DownloadZipServlet provideDownloadZipServlet(
//         IRuntimeManager runtimeManager,
//         IRepositoryManager repositoryManager) {
//
//      return new DownloadZipServlet(runtimeManager, repositoryManager);
//   }
//
//   @Provides @Singleton DownloadZipFilter provideDownloadZipFilter(
//         IRuntimeManager runtimeManager,
//         IAuthenticationManager authenticationManager,
//         IRepositoryManager repositoryManager) {
//
//      return new DownloadZipFilter(
//            runtimeManager,
//            authenticationManager,
//            repositoryManager);
//   }
//
//   @Provides @Singleton SyndicationServlet provideSyndicationServlet(
//         IRuntimeManager runtimeManager,
//         IRepositoryManager repositoryManager,
//         IProjectManager projectManager) {
//
//      return new SyndicationServlet(
//            runtimeManager,
//            repositoryManager,
//            projectManager);
//   }
//
//   @Provides @Singleton SyndicationFilter provideSyndicationFilter(
//         IRuntimeManager runtimeManager,
//         IAuthenticationManager authenticationManager,
//         IRepositoryManager repositoryManager,
//         IProjectManager projectManager) {
//
//      return new SyndicationFilter(
//            runtimeManager,
//            authenticationManager,
//            repositoryManager,
//            projectManager);
//   }
//
//   @Provides @Singleton FederationServlet provideFederationServlet(
//         IRuntimeManager runtimeManager,
//         IUserManager userManager,
//         IRepositoryManager repositoryManager,
//         IFederationManager federationManager) {
//
//      return new FederationServlet(
//            runtimeManager,
//            userManager,
//            repositoryManager,
//            federationManager);
//   }
//
//   @Provides @Singleton SparkleShareInviteServlet provideSparkleshareInviteServlet(
//         IRuntimeManager runtimeManager,
//         IUserManager userManager,
//         IAuthenticationManager authenticationManager,
//         IRepositoryManager repositoryManager) {
//
//      return new SparkleShareInviteServlet(
//            runtimeManager,
//            userManager,
//            authenticationManager,
//            repositoryManager);
//   }
//
//   @Provides @Singleton BranchGraphServlet provideBranchGraphServlet(
//         IRuntimeManager runtimeManager,
//         IRepositoryManager repositoryManager) {
//
//      return new BranchGraphServlet(runtimeManager, repositoryManager);
//   }
//
//   @Provides @Singleton RobotsTxtServlet provideRobotsTxtServlet(IRuntimeManager runtimeManager) {
//      return new RobotsTxtServlet(runtimeManager);
//   }
//
//   @Provides @Singleton LogoServlet provideLogoServlet(IRuntimeManager runtimeManager) {
//      return new LogoServlet(runtimeManager);
//   }
//
//   @Provides @Singleton EnforceAuthenticationFilter provideEnforceAuthenticationFilter(
//         IRuntimeManager runtimeManager,
//         IAuthenticationManager authenticationManager) {
//
//      return new EnforceAuthenticationFilter(runtimeManager, authenticationManager);
//   }


   @Provides @Singleton GitblitWicketFilter provideGitblitWicketFilter(GitBlitWebApp webapp) {
      return new GitblitWicketFilter();
   }

   @Provides GitServlet provideGitServlet(IGitblit gitblit) {
      return new GitServlet();
   }

   @Provides GitFilter provideGitFilter(
         IRuntimeManager runtimeManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
         IRepositoryManager repositoryManager,
         IFederationManager federationManager) {

      return new GitFilter();
   }

   @Provides @Singleton RawServlet provideRawServlet(
         IRuntimeManager runtimeManager,
         IRepositoryManager repositoryManager) {

      return new RawServlet();
   }

   @Provides @Singleton RawFilter provideRawFilter(
         IRuntimeManager runtimeManager,
         IAuthenticationManager authenticationManager,
         IRepositoryManager repositoryManager) {

      return new RawFilter();
   }

   @Provides @Singleton PagesServlet providePagesServlet(
         IRuntimeManager runtimeManager,
         IRepositoryManager repositoryManager) {

      return new PagesServlet();
   }

   @Provides @Singleton PagesFilter providePagesFilter(
         IRuntimeManager runtimeManager,
         IAuthenticationManager authenticationManager,
         IRepositoryManager repositoryManager) {

      return new PagesFilter();
   }

   @Provides @Singleton RpcServlet provideRpcServlet(IGitblit gitblit) {
      return new RpcServlet();
   }

   @Provides @Singleton RpcFilter provideRpcFilter(
         IRuntimeManager runtimeManager,
         IAuthenticationManager authenticationManager) {

      return new RpcFilter();
   }

   @Provides @Singleton DownloadZipServlet provideDownloadZipServlet(
         IRuntimeManager runtimeManager,
         IRepositoryManager repositoryManager) {

      return new DownloadZipServlet();
   }

   @Provides @Singleton DownloadZipFilter provideDownloadZipFilter(
         IRuntimeManager runtimeManager,
         IAuthenticationManager authenticationManager,
         IRepositoryManager repositoryManager) {

      return new DownloadZipFilter();
   }

   @Provides @Singleton SyndicationServlet provideSyndicationServlet(
         IRuntimeManager runtimeManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager) {

      return new SyndicationServlet();
   }

   @Provides @Singleton SyndicationFilter provideSyndicationFilter(
         IRuntimeManager runtimeManager,
         IAuthenticationManager authenticationManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager) {

      return new SyndicationFilter();
   }

   @Provides @Singleton FederationServlet provideFederationServlet(
         IRuntimeManager runtimeManager,
         IUserManager userManager,
         IRepositoryManager repositoryManager,
         IFederationManager federationManager) {

      return new FederationServlet();
   }

   @Provides @Singleton SparkleShareInviteServlet provideSparkleshareInviteServlet(
         IRuntimeManager runtimeManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
         IRepositoryManager repositoryManager) {

      return new SparkleShareInviteServlet();
   }

   @Provides @Singleton BranchGraphServlet provideBranchGraphServlet(
         IRuntimeManager runtimeManager,
         IRepositoryManager repositoryManager) {

      return new BranchGraphServlet();
   }

   @Provides @Singleton RobotsTxtServlet provideRobotsTxtServlet(IRuntimeManager runtimeManager) {
      return new RobotsTxtServlet();
   }

   @Provides @Singleton LogoServlet provideLogoServlet(IRuntimeManager runtimeManager) {
      return new LogoServlet();
   }

   @Provides @Singleton PtServlet providePtServlet(IRuntimeManager runtimeManager) {
      return new PtServlet();
   }

   @Provides @Singleton ProxyFilter provideProxyFilter(
         IRuntimeManager runtimeManager,
         IAuthenticationManager authenticationManager) {

      return new ProxyFilter();
   }

   @Provides @Singleton EnforceAuthenticationFilter provideEnforceAuthenticationFilter(
         IRuntimeManager runtimeManager,
         IAuthenticationManager authenticationManager) {

      return new EnforceAuthenticationFilter();
   }
}