Map gitservlet from web.xml and configure it from gitblit properties.

2 files changed, 16 insertions, 10 deletions

diff --git a/src/com/gitblit/GitBlitServer.java b/src/com/gitblit/GitBlitServer.java
index 3687e4db..678c9d43 100644
--- a/src/com/gitblit/GitBlitServer.java
+++ b/src/com/gitblit/GitBlitServer.java
@@ -38,11 +38,8 @@ import org.eclipse.jetty.server.session.HashSessionManager;
 import org.eclipse.jetty.server.ssl.SslConnector;

 import org.eclipse.jetty.server.ssl.SslSelectChannelConnector;

 import org.eclipse.jetty.server.ssl.SslSocketConnector;

-import org.eclipse.jetty.servlet.FilterMapping;

-import org.eclipse.jetty.servlet.ServletHolder;

 import org.eclipse.jetty.util.thread.QueuedThreadPool;

 import org.eclipse.jetty.webapp.WebAppContext;

-import org.eclipse.jgit.http.server.GitServlet;

 import org.slf4j.Logger;

 import org.slf4j.LoggerFactory;

 

@@ -197,13 +194,6 @@ public class GitBlitServer {
 		sessionManager.setSecureCookies(params.port <= 0 && params.securePort > 0);

 		rootContext.getSessionHandler().setSessionManager(sessionManager);

 

-		// JGit Filter and Servlet

-		String jgitPathSpec = Constants.GIT_PATH + "*";

-		rootContext.addFilter(GitFilter.class, jgitPathSpec, FilterMapping.DEFAULT);

-		ServletHolder jGitServlet = rootContext.addServlet(GitServlet.class, jgitPathSpec);

-		jGitServlet.setInitParameter("base-path", params.repositoriesFolder);

-		jGitServlet.setInitParameter("export-all", "1");

-

 		// Ensure there is a defined Login Service

 		String realmUsers = params.realmFile;

 		if (StringUtils.isEmpty(realmUsers)) {

diff --git a/src/com/gitblit/GitServlet.java b/src/com/gitblit/GitServlet.java
new file mode 100644
index 00000000..daf5d96e
--- /dev/null
+++ b/src/com/gitblit/GitServlet.java
@@ -0,0 +1,16 @@
+package com.gitblit;

+

+public class GitServlet extends org.eclipse.jgit.http.server.GitServlet {

+

+	private static final long serialVersionUID = 1L;

+

+	@Override

+	public String getInitParameter(String name) {

+		if (name.equals("base-path")) {

+			return GitBlit.getString(Keys.git.repositoriesFolder, "git");

+		} else if (name.equals("export-all")) {

+			return "1";

+		}

+		return super.getInitParameter(name);

+	}

+}