Merge branch 'ticket/180' into develop

James Moger

2014-09-17 ad3d2ca074cd3cf9c554f57c53b22f0de6abede9

 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;
@@ -90,7 +91,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 +103,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 +122,6 @@

   private final IAuthenticationManager authenticationManager;

   private final IPublicKeyManager publicKeyManager;

   private final IRepositoryManager repositoryManager;

   private final IProjectManager projectManager;
@@ -123,19 +130,26 @@

   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.xssFilter = runtimeManager.getXssFilter();
      this.runtimeManager = runtimeManager;
@@ -143,11 +157,11 @@
      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
@@ -392,7 +406,7 @@
    */
   @Override
   public IPublicKeyManager keys() {
      return publicKeyManager;
      return publicKeyManagerProvider.get();
   }

   /* (non-Javadoc)
@@ -428,11 +442,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)