From: James Moger <james.moger@gitblit.com>
Date: Thu, 4 Sep 2014 17:12:00 +0000 (-0400)
Subject: Merge branch 'ticket/148' into develop
X-Git-Tag: v1.7.0~1^2~190
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8d9750ef65660ca2488fc8ff65ba9c1040143c71;p=gitblit.git

Merge branch 'ticket/148' into develop
---

8d9750ef65660ca2488fc8ff65ba9c1040143c71
diff --cc src/main/java/com/gitblit/servlet/PagesServlet.java
index ad34b3ca,a8e83418..6f6d6502
--- a/src/main/java/com/gitblit/servlet/PagesServlet.java
+++ b/src/main/java/com/gitblit/servlet/PagesServlet.java
@@@ -1,89 -1,103 +1,116 @@@
--/*
-- * Copyright 2012 gitblit.com.
-- *
-- * Licensed under the Apache License, Version 2.0 (the "License");
-- * you may not use this file except in compliance with the License.
-- * You may obtain a copy of the License at
-- *
-- *     http://www.apache.org/licenses/LICENSE-2.0
-- *
-- * Unless required by applicable law or agreed to in writing, software
-- * distributed under the License is distributed on an "AS IS" BASIS,
-- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- * See the License for the specific language governing permissions and
-- * limitations under the License.
-- */
--package com.gitblit.servlet;
--
- import com.google.inject.Inject;
- import com.google.inject.Singleton;
 -import java.io.IOException;
 -import java.io.InputStream;
 -import java.util.Date;
 -
 -import javax.servlet.ServletException;
--import javax.servlet.http.HttpServletRequest;
--import javax.servlet.http.HttpServletResponse;
 -
 -import org.eclipse.jgit.lib.Repository;
 -import org.eclipse.jgit.revwalk.RevCommit;
--
--import com.gitblit.Constants;
- import com.gitblit.manager.IRepositoryManager;
- import com.gitblit.manager.IRuntimeManager;
 -import com.gitblit.utils.JGitUtils;
--
--/**
-- * Serves the content of a gh-pages branch.
-- *
-- * @author James Moger
-- *
-- */
- @Singleton
--public class PagesServlet extends RawServlet {
--
--	private static final long serialVersionUID = 1L;
--
--
--	/**
--	 * Returns an url to this servlet for the specified parameters.
--	 *
--	 * @param baseURL
--	 * @param repository
--	 * @param path
--	 * @return an url
--	 */
--	public static String asLink(String baseURL, String repository, String path) {
--		if (baseURL.length() > 0 && baseURL.charAt(baseURL.length() - 1) == '/') {
--			baseURL = baseURL.substring(0, baseURL.length() - 1);
--		}
--		return baseURL + Constants.PAGES + repository + "/" + (path == null ? "" : ("/" + path));
- 	}
- 
- 	@Inject
- 	public PagesServlet(
- 			IRuntimeManager runtimeManager,
- 			IRepositoryManager repositoryManager) {
- 
- 		super(runtimeManager, repositoryManager);
--	}
--
--	@Override
--	protected String getBranch(String repository, HttpServletRequest request) {
--		return "gh-pages";
--	}
--
--	@Override
--	protected String getPath(String repository, String branch, HttpServletRequest request) {
--		String pi = request.getPathInfo().substring(1);
--		if (pi.equals(repository)) {
--			return "";
--		}
--		String path = pi.substring(pi.indexOf(repository) + repository.length() + 1);
--		if (path.endsWith("/")) {
--			path = path.substring(0, path.length() - 1);
--		}
--		return path;
--	}
--
--	@Override
--	protected boolean renderIndex() {
--		return true;
--	}
--
--	@Override
--	protected void setContentType(HttpServletResponse response, String contentType) {
--		response.setContentType(contentType);;
 -	}
 -
 -	@Override
 -	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");
 -
 -		super.streamFromRepo(response, repository, commit, requestedPath);
 -	}
 -
 -	@Override
 -	protected 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");
 -
 -		super.sendContent(response, date, is);
--	}
--}
++/*
++ * Copyright 2012 gitblit.com.
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ *     http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++package com.gitblit.servlet;
++
++import java.io.IOException;
++import java.io.InputStream;
++import java.util.Date;
++
++import javax.servlet.ServletException;
++import javax.servlet.http.HttpServletRequest;
++import javax.servlet.http.HttpServletResponse;
++
++import org.eclipse.jgit.lib.Repository;
++import org.eclipse.jgit.revwalk.RevCommit;
++
++import com.gitblit.Constants;
++import com.gitblit.manager.IRepositoryManager;
++import com.gitblit.manager.IRuntimeManager;
++import com.gitblit.utils.JGitUtils;
++import com.google.inject.Inject;
++import com.google.inject.Singleton;
++
++/**
++ * Serves the content of a gh-pages branch.
++ *
++ * @author James Moger
++ *
++ */
++@Singleton
++public class PagesServlet extends RawServlet {
++
++	private static final long serialVersionUID = 1L;
++
++
++	/**
++	 * Returns an url to this servlet for the specified parameters.
++	 *
++	 * @param baseURL
++	 * @param repository
++	 * @param path
++	 * @return an url
++	 */
++	public static String asLink(String baseURL, String repository, String path) {
++		if (baseURL.length() > 0 && baseURL.charAt(baseURL.length() - 1) == '/') {
++			baseURL = baseURL.substring(0, baseURL.length() - 1);
++		}
++		return baseURL + Constants.PAGES + repository + "/" + (path == null ? "" : ("/" + path));
++	}
++
++	@Inject
++	public PagesServlet(
++			IRuntimeManager runtimeManager,
++			IRepositoryManager repositoryManager) {
++
++		super(runtimeManager, repositoryManager);
++	}
++
++	@Override
++	protected String getBranch(String repository, HttpServletRequest request) {
++		return "gh-pages";
++	}
++
++	@Override
++	protected String getPath(String repository, String branch, HttpServletRequest request) {
++		String pi = request.getPathInfo().substring(1);
++		if (pi.equals(repository)) {
++			return "";
++		}
++		String path = pi.substring(pi.indexOf(repository) + repository.length() + 1);
++		if (path.endsWith("/")) {
++			path = path.substring(0, path.length() - 1);
++		}
++		return path;
++	}
++
++	@Override
++	protected boolean renderIndex() {
++		return true;
++	}
++
++	@Override
++	protected void setContentType(HttpServletResponse response, String contentType) {
++		response.setContentType(contentType);;
++	}
++
++	@Override
++	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");
++
++		super.streamFromRepo(response, repository, commit, requestedPath);
++	}
++
++	@Override
++	protected 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");
++
++		super.sendContent(response, date, is);
++	}
++}