James Moger
2014-07-03 1c301ba07b13c1cd941c44805ee09d1ac8759bd5
src/main/java/com/gitblit/wicket/GitBlitWebApp.java
@@ -43,6 +43,7 @@
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;
@@ -57,6 +58,7 @@
import com.gitblit.wicket.pages.DocPage;
import com.gitblit.wicket.pages.DocsPage;
import com.gitblit.wicket.pages.EditMilestonePage;
import com.gitblit.wicket.pages.EditRepositoryPage;
import com.gitblit.wicket.pages.EditTicketPage;
import com.gitblit.wicket.pages.ExportTicketPage;
import com.gitblit.wicket.pages.FederationRegistrationPage;
@@ -71,6 +73,7 @@
import com.gitblit.wicket.pages.MyDashboardPage;
import com.gitblit.wicket.pages.MyTicketsPage;
import com.gitblit.wicket.pages.NewMilestonePage;
import com.gitblit.wicket.pages.NewRepositoryPage;
import com.gitblit.wicket.pages.NewTicketPage;
import com.gitblit.wicket.pages.OverviewPage;
import com.gitblit.wicket.pages.PatchPage;
@@ -87,12 +90,22 @@
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;
   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;
@@ -106,8 +119,6 @@
   private final IAuthenticationManager authenticationManager;
   private final IPublicKeyManager publicKeyManager;
   private final IRepositoryManager repositoryManager;
   private final IProjectManager projectManager;
@@ -116,30 +127,37 @@
   private final IGitblit gitblit;
   private final IServicesManager services;
   @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) {
      super();
      this.publicKeyManagerProvider = publicKeyManagerProvider;
      this.ticketServiceProvider = ticketServiceProvider;
      this.settings = runtimeManager.getSettings();
      this.runtimeManager = runtimeManager;
      this.pluginManager = pluginManager;
      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;
   }
   @Override
@@ -207,6 +225,8 @@
      mount("/proposal", ReviewProposalPage.class, "t");
      mount("/registration", FederationRegistrationPage.class, "u", "n");
      mount("/new", NewRepositoryPage.class);
      mount("/edit", EditRepositoryPage.class, "r");
      mount("/activity", ActivityPage.class, "r", "h");
      mount("/lucene", LuceneSearchPage.class);
      mount("/project", ProjectPage.class, "p");
@@ -260,6 +280,10 @@
   @Override
   public Class<? extends WebPage> getHomePage() {
      return homePageClass;
   }
   public Class<? extends WebPage> getNewRepositoryPage() {
      return newRepositoryPageClass;
   }
   /* (non-Javadoc)
@@ -370,7 +394,7 @@
    */
   @Override
   public IPublicKeyManager keys() {
      return publicKeyManager;
      return publicKeyManagerProvider.get();
   }
   /* (non-Javadoc)
@@ -406,11 +430,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)