From afe3f1fd5ba22bd8b5ae017db5f61982726b656c Mon Sep 17 00:00:00 2001
From: Alfred Schmid <A.Schmid@ff-muenchen.de>
Date: Wed, 19 Feb 2014 11:04:16 -0500
Subject: [PATCH] Fixed Tests, use local copy of users.conf. Initialize reset ldap before every test.
---
src/main/java/com/gitblit/GitBlitServer.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/GitBlitServer.java b/src/main/java/com/gitblit/GitBlitServer.java
index 292eec4..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;
@@ -409,9 +410,8 @@
rootContext.setHandler(sh);
}
- // Setup the GitBlit context
- GitBlit gitblit = newGitblit(settings, baseFolder);
- gitblit.configureContext(settings, baseFolder, true);
+ // Setup the Gitblit context
+ GitblitContext gitblit = newGitblit(settings, baseFolder);
rootContext.addEventListener(gitblit);
try {
@@ -430,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