From 0fe9792a9f194e68288c377810c33973d117923f Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 13 Dec 2013 08:12:47 -0500
Subject: [PATCH] Use multiple mappings for the git servlet instead of multiple instances
---
src/main/java/com/gitblit/GitBlitServer.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/GitBlitServer.java b/src/main/java/com/gitblit/GitBlitServer.java
index fe29804..522fb57 100644
--- a/src/main/java/com/gitblit/GitBlitServer.java
+++ b/src/main/java/com/gitblit/GitBlitServer.java
@@ -61,6 +61,7 @@
import com.beust.jcommander.Parameters;
import com.gitblit.authority.GitblitAuthority;
import com.gitblit.authority.NewCertificateConfig;
+import com.gitblit.servlet.GitblitContext;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.TimeUtils;
import com.gitblit.utils.X509Utils;
@@ -410,7 +411,7 @@
}
// Setup the Gitblit context
- GitBlit gitblit = newGitblit(settings, baseFolder);
+ GitblitContext gitblit = newGitblit(settings, baseFolder);
rootContext.addEventListener(gitblit);
try {
@@ -429,8 +430,8 @@
}
}
- protected GitBlit newGitblit(IStoredSettings settings, File baseFolder) {
- return new GitBlit(settings, baseFolder);
+ protected GitblitContext newGitblit(IStoredSettings settings, File baseFolder) {
+ return new GitblitContext(settings, baseFolder);
}
/**
--
Gitblit v1.9.1