Gitblit devel
blame | history | patch | commit | commitdiff | ignore whitespace
James Moger
2015-11-22 ed552ba47c02779c270ffd62841d6d1048dade70 
 src/main/java/com/gitblit/wicket/GitBlitWebApp.java


@@ -37,12 +37,14 @@


import com.gitblit.extensions.GitblitWicketPlugin;


import com.gitblit.manager.IAuthenticationManager;


import com.gitblit.manager.IFederationManager;


import com.gitblit.manager.IFilestoreManager;


import com.gitblit.manager.IGitblit;


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.IServicesManager;


import com.gitblit.manager.IUserManager;


import com.gitblit.tickets.ITicketService;


import com.gitblit.transport.ssh.IPublicKeyManager;


@@ -62,6 +64,7 @@


import com.gitblit.wicket.pages.EditTicketPage;


import com.gitblit.wicket.pages.ExportTicketPage;


import com.gitblit.wicket.pages.FederationRegistrationPage;


import com.gitblit.wicket.pages.FilestorePage;


import com.gitblit.wicket.pages.ForkPage;


import com.gitblit.wicket.pages.ForksPage;


import com.gitblit.wicket.pages.GitSearchPage;


@@ -90,7 +93,11 @@


import com.gitblit.wicket.pages.TreePage;


import com.gitblit.wicket.pages.UserPage;


import com.gitblit.wicket.pages.UsersPage;


import com.google.inject.Inject;


import com.google.inject.Provider;


import com.google.inject.Singleton;




@Singleton


public class GitBlitWebApp extends WebApplication implements GitblitWicketApp {




   private final Class<? extends WebPage> homePageClass = MyDashboardPage.class;


@@ -98,6 +105,10 @@


   private final Class<? extends WebPage> newRepositoryPageClass = NewRepositoryPage.class;




   private final Map<String, CacheControl> cacheablePages = new HashMap<String, CacheControl>();




   private final Provider<IPublicKeyManager> publicKeyManagerProvider;




   private final Provider<ITicketService> ticketServiceProvider;




   private final IStoredSettings settings;




@@ -113,8 +124,6 @@




   private final IAuthenticationManager authenticationManager;




   private final IPublicKeyManager publicKeyManager;




   private final IRepositoryManager repositoryManager;




   private final IProjectManager projectManager;


@@ -123,19 +132,29 @@




   private final IGitblit gitblit;




   private final IServicesManager services;


	


   private final IFilestoreManager filestoreManager;




   @Inject


   public GitBlitWebApp(


         Provider<IPublicKeyManager> publicKeyManagerProvider,


         Provider<ITicketService> ticketServiceProvider,


         IRuntimeManager runtimeManager,


         IPluginManager pluginManager,


         INotificationManager notificationManager,


         IUserManager userManager,


         IAuthenticationManager authenticationManager,


         IPublicKeyManager publicKeyManager,


         IRepositoryManager repositoryManager,


         IProjectManager projectManager,


         IFederationManager federationManager,


         IGitblit gitblit) {


         IGitblit gitblit,


         IServicesManager services,


         IFilestoreManager filestoreManager) {




      super();


      this.publicKeyManagerProvider = publicKeyManagerProvider;


      this.ticketServiceProvider = ticketServiceProvider;


      this.settings = runtimeManager.getSettings();


      this.xssFilter = runtimeManager.getXssFilter();


      this.runtimeManager = runtimeManager;


@@ -143,11 +162,12 @@


      this.notificationManager = notificationManager;


      this.userManager = userManager;


      this.authenticationManager = authenticationManager;


      this.publicKeyManager = publicKeyManager;


      this.repositoryManager = repositoryManager;


      this.projectManager = projectManager;


      this.federationManager = federationManager;


      this.gitblit = gitblit;


      this.services = services;


      this.filestoreManager = filestoreManager;


   }




   @Override


@@ -224,6 +244,9 @@


      mount("/user", UserPage.class, "user");


      mount("/forks", ForksPage.class, "r");


      mount("/fork", ForkPage.class, "r");


		


      // filestore URL


      mount("/filestore", FilestorePage.class);




      // allow started Wicket plugins to initialize


      for (PluginWrapper pluginWrapper : pluginManager.getPlugins()) {


@@ -392,7 +415,7 @@


    */


   @Override


   public IPublicKeyManager keys() {


      return publicKeyManager;


      return publicKeyManagerProvider.get();


   }




   /* (non-Javadoc)


@@ -428,11 +451,19 @@


   }




   /* (non-Javadoc)


    * @see com.gitblit.wicket.Webapp#services()


    */


   @Override


   public IServicesManager services() {


      return services;


   }




   /* (non-Javadoc)


    * @see com.gitblit.wicket.Webapp#tickets()


    */


   @Override


   public ITicketService tickets() {


      return gitblit.getTicketService();


      return ticketServiceProvider.get();


   }




   /* (non-Javadoc)


@@ -454,4 +485,9 @@


   public static GitBlitWebApp get() {


      return (GitBlitWebApp) WebApplication.get();


   }




   @Override


   public IFilestoreManager filestore() {


      return filestoreManager;


   }


}