Merge branch 'ticket/148' into develop

2 files changed, 119 insertions, 96 deletions

diff --git a/src/main/java/com/gitblit/servlet/PagesServlet.java b/src/main/java/com/gitblit/servlet/PagesServlet.java
index ad34b3ca..6f6d6502 100644
--- a/src/main/java/com/gitblit/servlet/PagesServlet.java
+++ b/src/main/java/com/gitblit/servlet/PagesServlet.java
@@ -1,89 +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 javax.servlet.http.HttpServletRequest;

-import javax.servlet.http.HttpServletResponse;

-

-import com.gitblit.Constants;

-import com.gitblit.manager.IRepositoryManager;

-import com.gitblit.manager.IRuntimeManager;

-

-/**

- * 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);;

-	}

-}

+/*
+ * 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);
+	}
+}
diff --git a/src/main/java/com/gitblit/servlet/RawServlet.java b/src/main/java/com/gitblit/servlet/RawServlet.java
index 062b240e..0ae91559 100644
--- a/src/main/java/com/gitblit/servlet/RawServlet.java
+++ b/src/main/java/com/gitblit/servlet/RawServlet.java
@@ -425,12 +425,9 @@ public class RawServlet extends HttpServlet {
 		}
 	}
 
-	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);
 		try {
@@ -461,9 +458,8 @@ public class RawServlet extends HttpServlet {
 		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;