Remove @Inject references because they confuse JEE containers

James Moger

2013-12-10 cc47aad618137ee6481c8bc164d8074bd30fde9e

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

@@ -19,12 +19,13 @@


import javax.servlet.http.HttpServletRequest;



import org.apache.wicket.protocol.http.IWebApplicationFactory;

import org.apache.wicket.protocol.http.WebApplication;

import org.apache.wicket.protocol.http.WicketFilter;

import org.apache.wicket.util.string.Strings;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.GitBlit;

import com.gitblit.IStoredSettings;

import com.gitblit.Keys;

import com.gitblit.manager.IProjectManager;

@@ -45,6 +46,36 @@
 */

public class GitblitWicketFilter extends WicketFilter {



   private final IStoredSettings settings;



   private final IRuntimeManager runtimeManager;



   private final IRepositoryManager repositoryManager;



   private final IProjectManager projectManager;



   private final GitBlitWebApp webapp;



   public GitblitWicketFilter(GitBlitWebApp webapp) {



      super();

      this.settings = webapp.settings();

      this.runtimeManager = webapp.runtime();

      this.repositoryManager = webapp.repositories();

      this.projectManager = webapp.projects();

      this.webapp = webapp;

   }



   @Override

   protected IWebApplicationFactory getApplicationFactory() {

      return new IWebApplicationFactory() {

         @Override

         public WebApplication createApplication(WicketFilter filter) {

            return webapp;

         }

      };

   }



   /**

    * Determines the last-modified date of the requested resource.

    *

@@ -54,8 +85,9 @@
   @Override

   protected long getLastModified(final HttpServletRequest servletRequest)   {

      final String pathInfo = getRelativePath(servletRequest);

      if (Strings.isEmpty(pathInfo))

      if (Strings.isEmpty(pathInfo)) {

         return -1;

      }

      long lastModified = super.getLastModified(servletRequest);

      if (lastModified > -1) {

         return lastModified;

@@ -80,11 +112,6 @@
      if (!StringUtils.isEmpty(servletRequest.getParameter("h"))) {

         commitId = servletRequest.getParameter("h");

      }



      IRuntimeManager runtimeManager = GitBlit.getManager(IRuntimeManager.class);

      IStoredSettings settings = runtimeManager.getSettings();

      IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);

      IProjectManager projectManager = GitBlit.getManager(IProjectManager.class);



      repo = repo.replace("%2f", "/").replace("%2F", "/").replace(settings.getChar(Keys.web.forwardSlashCharacter, '/'), '/');