Merge branch 'ticket/170' into develop

James Moger

2014-09-08 671b5a456c48028d21855fe05c1fbc9013a180b7

 src/main/java/com/gitblit/wicket/GitBlitWebApp.java

@@ -47,6 +47,7 @@
import com.gitblit.manager.IUserManager;
import com.gitblit.tickets.ITicketService;
import com.gitblit.transport.ssh.IPublicKeyManager;
import com.gitblit.utils.XssFilter;
import com.gitblit.wicket.pages.ActivityPage;
import com.gitblit.wicket.pages.BlamePage;
import com.gitblit.wicket.pages.BlobDiffPage;
@@ -105,7 +106,11 @@

   private final Provider<IPublicKeyManager> publicKeyManagerProvider;

   private final Provider<ITicketService> ticketServiceProvider;

   private final IStoredSettings settings;

   private final XssFilter xssFilter;

   private final IRuntimeManager runtimeManager;

@@ -130,6 +135,7 @@
   @Inject
   public GitBlitWebApp(
         Provider<IPublicKeyManager> publicKeyManagerProvider,
         Provider<ITicketService> ticketServiceProvider,
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager,
         INotificationManager notificationManager,
@@ -143,7 +149,9 @@

      super();
      this.publicKeyManagerProvider = publicKeyManagerProvider;
      this.ticketServiceProvider = ticketServiceProvider;
      this.settings = runtimeManager.getSettings();
      this.xssFilter = runtimeManager.getXssFilter();
      this.runtimeManager = runtimeManager;
      this.pluginManager = pluginManager;
      this.notificationManager = notificationManager;
@@ -261,7 +269,7 @@
      if (!settings.getBoolean(Keys.web.mountParameters, true)) {
         parameters = new String[] {};
      }
      mount(new GitblitParamUrlCodingStrategy(settings, location, clazz, parameters));
      mount(new GitblitParamUrlCodingStrategy(settings, xssFilter, location, clazz, parameters));

      // map the mount point to the cache control definition
      if (clazz.isAnnotationPresent(CacheControl.class)) {
@@ -315,6 +323,14 @@
   @Override
   public IStoredSettings settings() {
      return settings;
   }

   /* (non-Javadoc)
    * @see com.gitblit.wicket.Webapp#xssFilter()
    */
   @Override
   public XssFilter xssFilter() {
      return xssFilter;
   }

   /* (non-Javadoc)
@@ -438,7 +454,7 @@
    */
   @Override
   public ITicketService tickets() {
      return gitblit.getTicketService();
      return ticketServiceProvider.get();
   }

   /* (non-Javadoc)