Merge branch 'ticket/148' into develop

James Moger

2014-09-04 8d9750ef65660ca2488fc8ff65ba9c1040143c71

 src/main/java/com/gitblit/servlet/RawServlet.java

@@ -28,8 +28,11 @@
import java.util.Map;
import java.util.TreeMap;

import com.google.inject.Inject;
import com.google.inject.Singleton;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

@@ -48,7 +51,6 @@

import com.gitblit.Constants;
import com.gitblit.Keys;
import com.gitblit.dagger.DaggerServlet;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.models.PathModel;
@@ -57,28 +59,30 @@
import com.gitblit.utils.MarkdownUtils;
import com.gitblit.utils.StringUtils;

import dagger.ObjectGraph;

/**
 * Serves the content of a branch.
 *
 * @author James Moger
 *
 */
public class RawServlet extends DaggerServlet {
@Singleton
public class RawServlet extends HttpServlet {

   private static final long serialVersionUID = 1L;

   private transient Logger logger = LoggerFactory.getLogger(RawServlet.class);

   private IRuntimeManager runtimeManager;
   private final IRuntimeManager runtimeManager;

   private IRepositoryManager repositoryManager;
   private final IRepositoryManager repositoryManager;

   @Override
   protected void inject(ObjectGraph dagger) {
      this.runtimeManager = dagger.get(IRuntimeManager.class);
      this.repositoryManager = dagger.get(IRepositoryManager.class);
   @Inject
   public RawServlet(
         IRuntimeManager runtimeManager,
         IRepositoryManager repositoryManager) {

      this.runtimeManager = runtimeManager;
      this.repositoryManager = repositoryManager;
   }

   /**
@@ -173,6 +177,9 @@
            repository = path.substring(0, slash);
         }
         offset += slash;
         if (offset == 0) {
            offset++;
         }
         r = repositoryManager.getRepository(repository, false);
         if (repository.equals(path)) {
            // either only repository in url or no repository found
@@ -252,6 +259,15 @@
                  // load, interpret, and serve text content as UTF-8
                  String [] encodings = runtimeManager.getSettings().getStrings(Keys.web.blobEncodings).toArray(new String[0]);
                  String content = JGitUtils.getStringContent(r, commit.getTree(), requestedPath, encodings);
                  if (content == null) {
                     logger.error("RawServlet Failed to load {} {} {}", repository, commit.getName(), path);
                     String str = MessageFormat.format(
                           "# Error\nSorry, the requested resource **{0}** was not found.",
                           requestedPath);
                     response.setStatus(HttpServletResponse.SC_NOT_FOUND);
                     error(response, str);
                     return;
                  }

                  byte [] bytes = content.getBytes(Constants.ENCODING);
                  response.setContentLength(bytes.length);
@@ -409,11 +425,8 @@
      }
   }

   private void streamFromRepo(HttpServletResponse response, Repository repository,
   protected void streamFromRepo(HttpServletResponse response, Repository repository,
         RevCommit commit, String requestedPath) throws IOException {

      response.setDateHeader("Last-Modified", JGitUtils.getCommitDate(commit).getTime());
      response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");

      RevWalk rw = new RevWalk(repository);
      TreeWalk tw = new TreeWalk(repository);
@@ -445,9 +458,8 @@
      response.flushBuffer();
   }

   private void sendContent(HttpServletResponse response, Date date, InputStream is) throws ServletException, IOException {
      response.setDateHeader("Last-Modified", date.getTime());
      response.setHeader("Cache-Control", "public, max-age=3600, must-revalidate");
   protected void sendContent(HttpServletResponse response, Date date, InputStream is) throws ServletException, IOException {

      try {
         byte[] tmp = new byte[8192];
         int len = 0;